gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Completely rework the navigation

Browse source 
Get rid of the admin layout
Get rid of the navbar custom style, use bootstrap-sass variables instead
Get rid of all the scaffold files
This commit is contained in:
Henne Vogelsang 2013-06-27 16:58:20 +02:00 • committed by Henne Vogelsang
parent 2af8792495
commit 252e1fe544
47 changed files with 179 additions and 252 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/admin/admin.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/javascripts/admin/call_for_papers.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/javascripts/admin/conference.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/javascripts/admin/people.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/javascripts/admin/supporters.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/javascripts/admin/users.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/javascripts/admin/venue.js.coffee
View file

@ -1,3 +0,0 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

3
app/assets/stylesheets/admin/admin.css.scss
View file

@ -1,3 +0,0 @@
// Place all the styles related to the admin/admin controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/admin/call_for_papers.css.scss
View file

@ -1,3 +0,0 @@
// Place all the styles related to the admin/call_for_papers controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/admin/conference.css.scss
View file

@ -1,3 +0,0 @@
// Place all the styles related to the admin/conference controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/admin/people.css.scss
View file

@ -1,3 +0,0 @@
// Place all the styles related to the admin/people controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/admin/supporters.css.scss
View file

@ -1,3 +0,0 @@
// Place all the styles related to the admin/supporters controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/admin/users.css.scss
View file

@ -1,3 +0,0 @@
// Place all the styles related to the admin/users controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

3
app/assets/stylesheets/admin/venue.css.scss
View file

@ -1,3 +0,0 @@
// Place all the styles related to the admin/venue controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

46
app/assets/stylesheets/osem.css
View file

@ -24,6 +24,15 @@
background-color: #f5f5f5;
}
.container .credit {
margin: 20px 0;
}
.nav-collapse .dropdown-menu {
background-color: #e6e6e6;
color: #555555;
}
/* Lastly, apply responsive CSS fixes as necessary */
@media (max-width: 767px) {
#footer {
@ -34,41 +43,8 @@
}
}
.container#messages {
padding-top: 60px;
}
.navbar-inner {
background: #299a0b; /* Old browsers */
background: -moz-linear-gradient(top, #299a0b 0%, #299a0b 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#299a0b), color-stop(100%,#299a0b)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #299a0b 0%,#299a0b 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #299a0b 0%,#299a0b 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #299a0b 0%,#299a0b 100%); /* IE10+ */
background: linear-gradient(to bottom, #299a0b 0%,#299a0b 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#299a0b', endColorstr='#299a0b',GradientType=0 ); /* IE6-9 */
}
.navbar .nav .active > a, .navbar .nav .active > a:hover {
background-color: #DFE0DF;
}
.navbar .divider-vertical {
background-color: #b4e391;
border-right: 1px solid #eab92d;
}
.navbar-fixed-top .brand {
color: #ffffff;
text-shadow:none;
}
.navbar .nav > li > a {
float: none;
padding: 10px 15px 10px;
color: white;
text-decoration: none;
text-shadow: none;
@media screen and (min-width: 980px) {
body { padding-top: 60px; }
}
.center {

13
app/assets/stylesheets/strap-on.css.scss
View file

@ -1,2 +1,15 @@
$navbarBackground: #299a0b;
$navbarBackgroundHighlight: #299a0b;
$navbarBorder: 1px solid #d4d4d4;
$navbarText: #ffffff;
$navbarLinkColor: white;
$navbarLinkColorHover: black;
$navbarLinkBackgroundActive: #DFE0DF;
@import "bootstrap";
@import "bootstrap-responsive";
/* Set to navbarBackgroundHighlight otherwise */
.navbar .nav > li > a {
text-shadow: none;
}