Commit 545a7340 authored by Thomas Park's avatar Thomas Park
Browse files

cyborg: use droid sans, tweak font size

parent ee98fbf3
@import url("//fonts.googleapis.com/css?family=Droid+Sans:400,700");
@import url("//fonts.googleapis.com/css?family=Roboto:400,700");
/*!
* Bootswatch v3.2.0
* Homepage: http://bootswatch.com
......@@ -889,7 +889,7 @@ html {
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
body {
font-family: "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 14px;
line-height: 1.42857143;
color: #888888;
......@@ -990,7 +990,7 @@ h6,
.h4,
.h5,
.h6 {
font-family: "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 500;
line-height: 1.1;
color: #ffffff;
......@@ -1071,27 +1071,27 @@ h6 .small,
}
h1,
.h1 {
font-size: 36px;
font-size: 56px;
}
h2,
.h2 {
font-size: 30px;
font-size: 45px;
}
h3,
.h3 {
font-size: 24px;
font-size: 34px;
}
h4,
.h4 {
font-size: 18px;
font-size: 24px;
}
h5,
.h5 {
font-size: 14px;
font-size: 20px;
}
h6,
.h6 {
font-size: 12px;
font-size: 16px;
}
p {
margin: 0 0 10px;
......@@ -4080,7 +4080,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.navbar-default {
background-color: #060606;
border-color: #000000;
border-color: #282828;
}
.navbar-default .navbar-brand {
color: #ffffff;
......@@ -4125,7 +4125,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.navbar-default .navbar-collapse,
.navbar-default .navbar-form {
border-color: #000000;
border-color: #282828;
}
.navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .open > a:hover,
......@@ -6171,9 +6171,6 @@ button.close {
display: none !important;
}
}
.navbar {
border-bottom: 1px solid #282828;
}
.text-primary,
.text-primary:hover {
color: #2a9fd6;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,15 +2,10 @@
// Bootswatch
// -----------------------------------------------------
@import url("//fonts.googleapis.com/css?family=Droid+Sans:400,700");
@import url("//fonts.googleapis.com/css?family=Roboto:400,700");
// Navbar =====================================================================
.navbar {
border-bottom: 1px solid @gray-dark;
}
// Buttons ====================================================================
// Typography =================================================================
......
......@@ -39,7 +39,7 @@
//
//## Font, line-height, and color for body text, headings, and more.
@font-family-sans-serif: "Droid Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-sans-serif: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
@font-family-serif: Georgia, "Times New Roman", Times, serif;
//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
......@@ -49,12 +49,12 @@
@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
@font-size-h5: @font-size-base;
@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
@font-size-h1: 56px;
@font-size-h2: 45px;
@font-size-h3: 34px;
@font-size-h4: 24px;
@font-size-h5: 20px;
@font-size-h6: 16px;
//** Unit-less `line-height` for use in components like buttons.
@line-height-base: 1.428571429; // 20/14
......@@ -344,7 +344,7 @@
@navbar-default-color: @text-color;
@navbar-default-bg: @body-bg;
@navbar-default-border: darken(@navbar-default-bg, 6.5%);
@navbar-default-border: @gray-dark;
// Navbar links
@navbar-default-link-color: @text-color;
......
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