From f5a094fd8b32d44767f7fc30a65f407f4e1d9945 Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Sat, 23 Aug 2014 01:55:18 +0200 Subject: add user view, better bootstrap --- themes/base.scss | 4 ++++ themes/theme1.scss | 49 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 39 insertions(+), 14 deletions(-) (limited to 'themes') diff --git a/themes/base.scss b/themes/base.scss index 802524a6..70d1a4b7 100644 --- a/themes/base.scss +++ b/themes/base.scss @@ -6,3 +6,7 @@ $icon-font-path: "../fonts/"; body { padding-top: 50px; } + +.footer a { + color: $text-muted; +} \ No newline at end of file diff --git a/themes/theme1.scss b/themes/theme1.scss index 699ddd86..bd1919e1 100644 --- a/themes/theme1.scss +++ b/themes/theme1.scss @@ -1,5 +1,29 @@ @import "../vendor/bootstrap-3.2.0/_variables"; +/* +The MIT License (MIT) + +Copyright (c) 2013 Thomas Park + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. +*/ + // Cyborg 3.2.0 // Variables // -------------------------------------------------- @@ -14,11 +38,11 @@ $gray: #555; // #555 $gray-light: #888; // #999 $gray-lighter: #ADAFAE; // #eee -$brand-primary: #2A9FD6; -$brand-success: #77B300; -$brand-info: $brand-primary; -$brand-warning: #FF8800; -$brand-danger: #CC0000; +$brand-primary: #428bca; +$brand-success: #5cb85c; +$brand-info: #5bc0de; +$brand-warning: #f0ad4e; +$brand-danger: #d9534f; //== Scaffolding @@ -40,7 +64,6 @@ $link-hover-color: $link-color; // //## Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif; $font-family-serif: Georgia, "Times New Roman", Times, serif; //** Default monospace fonts for ``, ``, and `
`.
 $font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace;
@@ -50,10 +73,10 @@ $font-size-base:          14px;
 $font-size-large:         ceil(($font-size-base * 1.25)); // ~18px
 $font-size-small:         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-h1:            34px;
+$font-size-h2:            24px;
+$font-size-h3:            20px;
+$font-size-h4:            20px;
 $font-size-h5:            20px;
 $font-size-h6:            16px;
 
@@ -845,12 +868,12 @@ $dl-horizontal-offset:        $component-offset-horizontal;
 //** Horizontal line color.
 $hr-border:                   $gray-dark;
 
+@import "base";
+
 // Cyborg 3.2.0
 // Bootswatch
 // -----------------------------------------------------
 
-@import url("//fonts.googleapis.com/css?family=Roboto:400,700");
-
 // Navbar =====================================================================
 
 // Buttons ====================================================================
@@ -1009,5 +1032,3 @@ a.thumbnail.active {
     color: #fff;
   }
 }
-
-@import "base";
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2