add styling
This commit is contained in:
parent
32abe5f196
commit
1537d5f290
4 changed files with 18 additions and 3 deletions
|
|
@ -2,6 +2,7 @@
|
|||
*= require strap-on
|
||||
*= require formtastic-bootstrap
|
||||
*= require dataTables/bootstrap/3/jquery.dataTables.bootstrap
|
||||
*= require osem-fonts
|
||||
*= require osem
|
||||
*= require osem-rating
|
||||
*= require osem-schedule
|
||||
|
|
@ -9,7 +10,6 @@
|
|||
*= require osem-dashboard
|
||||
*= require osem-splash
|
||||
*= require font-awesome
|
||||
*= require osem-fonts
|
||||
*= require bootstrap-markdown
|
||||
*= require bootstrap-datetimepicker
|
||||
*= require leaflet
|
||||
|
|
|
|||
|
|
@ -42,4 +42,4 @@
|
|||
|
||||
.fa-suse:before {
|
||||
content: "a";
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,25 @@
|
|||
//== max mearsheimers colors
|
||||
$darkgray: #263238;
|
||||
$blue: #22C2E6;
|
||||
$mediumgray: #4A4A4A;
|
||||
$green: rgba(121, 188, 130, 1);
|
||||
$darkblue: rgba(0, 123, 171, 1);
|
||||
|
||||
//== Bootstrap Colors
|
||||
$brand-primary: $blue;
|
||||
|
||||
html {
|
||||
position: relative;
|
||||
min-height: 100%;
|
||||
}
|
||||
$program: 'program-n4', Program, sans-serif;
|
||||
|
||||
body {
|
||||
/* Margin bottom by 2 times the footer height */
|
||||
margin-bottom: 60px;
|
||||
/* Margin bottom by navbar height */
|
||||
padding-top: 60px;
|
||||
font-family: $program, Program, serif !important;
|
||||
}
|
||||
|
||||
#content {
|
||||
|
|
|
|||
|
|
@ -3,10 +3,13 @@
|
|||
%meta{charset: 'utf-8'}
|
||||
%meta{name: 'viewport', content: 'width=device-width, initial-scale=1, maximum-scale=1'}
|
||||
%title= content_for?(:title) ? yield(:title) : (ENV['OSEM_NAME'] || 'OSEM')
|
||||
= javascript_include_tag '//use.typekit.net/uzo8iqp.js'
|
||||
%script{ type: 'text/javascript', src: '//use.typekit.net/uzo8iqp.js' }
|
||||
%script{ type: 'text/javascript' } try{Typekit.load();}catch(e){}
|
||||
%meta{content: '', name: 'description'}
|
||||
%meta{content: '', name: 'author'}
|
||||
= stylesheet_link_tag "application", media: 'all'
|
||||
= javascript_include_tag "application"
|
||||
= stylesheet_link_tag "application", media: 'all'
|
||||
|
||||
= csrf_meta_tags
|
||||
:javascript
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue