wassname/cardsforscience
1
0
Fork 0
mirror of https://github.com/wassname/cardsforscience.git synced 2026-06-27 17:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Some UI tweaks

Browse Source
This commit is contained in:
Tadej Novak
2014-12-10 17:18:32 +01:00
parent f8eed326e9
commit a193c0379f
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/style.css
+5
View File
@@ -53,6 +53,11 @@ h1 br {
overflow: auto;
}
.research-icon {
float: left;
margin-right: 10px;
}
#achievements-container {
position: fixed; bottom: 0px; left: 0px;
}
index.html
+2 -2
View File
@@ -81,8 +81,8 @@
<div id="researchContent" ng-controller="ResearchController as rc">
<ul class="media-list" ng-cloak>
<li class="media" ng-repeat="r in rc.research" ng-show="rc.isVisible(r)">
<img ng-show="r.state.level > 0" class="pull-left media-object" ng-src="{{ r.image }}" alt="">
<img ng-hide="r.state.level > 0" class="pull-left media-object" src="assets/icons/png/unknown.png" alt="">
<img ng-show="r.state.level > 0" class="research-icon media-object" ng-src="{{ r.image }}" alt="">
<img ng-hide="r.state.level > 0" class="research-icon media-object" src="assets/icons/png/unknown.png" alt="">
<div class="media-body">
<h4 class="media-heading">{{ r.state.level > 0 ? r.name : '?????' }} <span ng-show="r.state.level > 0" class="badge">Level {{ r.state.level }}</span></h4>
<p ng-show="r.state.level > 0">{{ r.description }}</p>
js/ui.js
+3 -3
View File
@@ -35,7 +35,7 @@ var UI = (function () {
}
if ($(window).width() < 600) {
var newWidth = Math.max($(window).width() - ($(window).height() - 80 + 10), 300);
var newWidth = Math.max($(window).width() - ($(window).height() - 90 + 10), 300);
$('#column-lab').width($(window).width() - newWidth);
$('#column-tabs').width(newWidth);
} else {
@@ -48,8 +48,8 @@ var UI = (function () {
$('#detector').width(500).height(500);
detector.init(500);
}
} else if ($(window).width() < 768 && $(window).height() - 80 < 300) {
var newWidth = $(window).width() - Math.max($(window).width() - ($(window).height() - 80 + 10), 300) - 10;
} else if ($(window).width() < 768 && $(window).height() - 90 < 300) {
var newWidth = $(window).width() - Math.max($(window).width() - ($(window).height() - 90 + 10), 300) - 10;
if (detector.width != newWidth) {
$('#detector').width(newWidth).height(newWidth);
detector.init(newWidth);