Unverified Commit 457fa239 authored by liuzheng712's avatar liuzheng712

Merge branch 'dev'

parents 7dcb7d32 93b629f0
......@@ -51,7 +51,7 @@ label {
.search {
border-left-width: 0;
border-bottom: gold 2px inset;
border-bottom: #19aa8d 2px inset;
}
.left-search {
......@@ -71,3 +71,7 @@ label {
padding: 1px 20px 0 20px;
position: absolute;
}
.fa.fa-undefined:before {
content: "\f26c";
}
......@@ -32,7 +32,7 @@
.tabs ul li.active {
box-sizing: border-box;
border-bottom: 3px solid #7f3f98 !important;
border-bottom: 3px solid #19aa8d !important;
}
.tabs ul li span {
......
//@import url("https://fonts.googleapis.com/css?family=Roboto:400,300,500,700");
$md-color-primary: #1AB394;
$md-shadow-main: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12);
......
......@@ -5,7 +5,6 @@
*
*/
// Google Fonts
//@import url("https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700");
// Variables, Mixins
@import "imports/variables";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment