Browse Source

Only color status text, not panel headings (fixes #1039)

Jakob Borg 11 years ago
parent
commit
4de39b205d
3 changed files with 19 additions and 14 deletions
  1. 14 9
      gui/assets/css/overrides.css
  2. 4 4
      gui/index.html
  3. 1 1
      internal/auto/gui.files.go

+ 14 - 9
gui/assets/css/overrides.css

@@ -46,11 +46,6 @@ identicon {
     height: 30px;
 }
 
-.identicon rect {
-    opacity: 0.85;
-    fill: #888;
-}
-
 .panel-heading .identicon {
     display: block;
     position: absolute;
@@ -63,10 +58,20 @@ identicon {
     overflow: hidden;
 }
 
-[class*="-info"] .identicon rect,
-[class*="-success"] .identicon rect,
-[class*="-primary"] .identicon rect {
-    fill: #fff;
+.identicon rect {
+    fill: #666;
+}
+.identicon-success rect {
+    fill: #2ecc71;
+}
+.identicon-info rect {
+    fill: #9b59b6;
+}
+.identicon-warning rect {
+    fill: #f1c40f;
+}
+.identicon-primary rect {
+    fill: #3498db;
 }
 
 .text-monospace {

+ 4 - 4
gui/index.html

@@ -89,11 +89,11 @@
 
       <div class="col-md-6">
         <div class="panel-group" id="folders">
-          <div class="panel panel-{{folderClass(folder)}}" ng-repeat="folder in folderList()">
+          <div class="panel panel-default" ng-repeat="folder in folderList()">
             <div class="panel-heading" data-toggle="collapse" data-parent="#folders" href="#folder-{{$index}}" style="cursor: pointer">
               <h3 class="panel-title">
                 <span class="glyphicon glyphicon-hdd"></span>&emsp;{{folder.ID}}
-                <span class="pull-right hidden-xs" ng-switch="folderStatus(folder)">
+                <span class="pull-right hidden-xs text-{{folderClass(folder)}}" ng-switch="folderStatus(folder)">
                   <span translate ng-switch-when="unknown">Unknown</span>
                   <span translate ng-switch-when="unshared">Unshared</span>
                   <span translate ng-switch-when="stopped">Stopped</span>
@@ -223,11 +223,11 @@
         <!-- Remote devices -->
 
         <div class="panel-group" id="devices">
-          <div class="panel panel-{{deviceClass(deviceCfg)}}" ng-repeat="deviceCfg in otherDevices()">
+          <div class="panel panel-default" ng-repeat="deviceCfg in otherDevices()">
             <div class="panel-heading" data-toggle="collapse" data-parent="#devices" href="#device-{{$index}}" style="cursor: pointer">
               <h3 class="panel-title">
                 <identicon data-value="deviceCfg.DeviceID"></identicon>&emsp;{{deviceName(deviceCfg)}}
-                <span ng-switch="deviceStatus(deviceCfg)" class="pull-right hidden-xs">
+                <span ng-switch="deviceStatus(deviceCfg)" class="pull-right hidden-xs text-{{deviceClass(deviceCfg)}}">
                   <span ng-switch-when="insync">
                     <span translate>Up to Date</span> (100%)
                   </span>

File diff suppressed because it is too large
+ 1 - 1
internal/auto/gui.files.go


Some files were not shown because too many files changed in this diff