浏览代码

feat(footer): some minor changes to footer to make it look good in light theme, closes #4889

Torkel Ödegaard 9 年之前
父节点
当前提交
10c47ee27c

+ 1 - 1
pkg/cmd/grafana-server/main.go

@@ -24,7 +24,7 @@ import (
 	"github.com/grafana/grafana/pkg/social"
 )
 
-var version = "3.0.0-beta4"
+var version = "3.1.0"
 var commit = "NA"
 var buildstamp string
 var build_date string

+ 4 - 0
public/sass/_variables.dark.scss

@@ -268,3 +268,7 @@ $checkboxImageUrl: '../img/checkbox.png';
 $card-background: linear-gradient(135deg, #2f2f2f, #262626);
 $card-background-hover: linear-gradient(135deg, #343434, #262626);
 $card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .3);
+
+// footer
+$footer-link-color:   $gray-1;
+$footer-link-hover:   $gray-4;

+ 4 - 0
public/sass/_variables.light.scss

@@ -292,3 +292,7 @@ $checkboxImageUrl: '../img/checkbox_white.png';
 $card-background: linear-gradient(135deg, $gray-5, $gray-6);
 $card-background-hover: linear-gradient(135deg, $gray-6, $gray-7);
 $card-shadow: -1px -1px 0 0 hsla(0, 0%, 100%, .1), 1px 1px 0 0 rgba(0, 0, 0, .1);
+
+// footer
+$footer-link-color:   $gray-3;
+$footer-link-hover:   $dark-5;

+ 32 - 34
public/sass/components/_footer.scss

@@ -1,40 +1,38 @@
-.page-dashboard footer {
+.page-dashboard .footer {
 	display: none;
 }
 
-footer {
-		font-size: 75%;
-		width: 98%;  /* was causing horiz scrollbars - need to examine */
-	a {
-		color: $gray-1;
-	}
-	ul {
-		list-style: none;
-	}
-	li { display: inline-block;
-		padding-right: 2px;
-		 &:after {
-		 	content: ' | ';
-		 	padding-left: 2px;
-		 	color: $gray-1;
-		 }
-	}
-	li:last-child {
-		&:after {
-			padding-left: 0;
-			content: '';
-		}
-	}
-}
-
-.grafana-version-info {
-  position: absolute;
-  bottom: 2px;
-  left: 3px;
-  color: darken($gray-1, 25%);
-  a { color: darken($gray-1, 25%); }
-}
-
 .footer {
+  color: $footer-link-color;
   padding: 5rem 0 1rem 0;
+  font-size: $font-size-xs;
+  width: 98%;  /* was causing horiz scrollbars - need to examine */
+
+  a {
+    color: $footer-link-color;
+
+    &:hover {
+      color: $footer-link-hover;
+    }
+  }
+
+  ul {
+    list-style: none;
+  }
+
+  li {
+    display: inline-block;
+    padding-right: 2px;
+    &:after {
+      content: ' | ';
+      padding-left: 2px;
+    }
+  }
+
+  li:last-child {
+    &:after {
+      padding-left: 0;
+      content: '';
+    }
+  }
 }

+ 2 - 2
public/views/index.html

@@ -60,9 +60,9 @@
 								Community
 							</a>
 						</li>
-						<li>	
+						<li>
 							<a href="http://grafana.org" target="_blank">Grafana</a>
-							<span class="muted">v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
+							<span>v[[.BuildVersion]] (commit: [[.BuildCommit]])</span>
 						</li>
 						<li>
 							[[if .NewGrafanaVersionExists]]