Moved to the bootstrap-sass gem, lot's of styling issues fixed
This commit is contained in:
parent
94e014ac40
commit
2a927a42b0
23 changed files with 290 additions and 1124 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 8.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
|
|
@ -17,5 +17,5 @@
|
|||
//= require jquery-ui-timepicker-addon
|
||||
//= require jquery.dataTables
|
||||
//= require cocoon
|
||||
//= require bootstrap.min
|
||||
//= require bootstrap
|
||||
//= require osem
|
||||
|
|
|
|||
|
|
@ -1,4 +0,0 @@
|
|||
jQuery ->
|
||||
$("a[rel=popover]").popover()
|
||||
$(".tooltip").tooltip()
|
||||
$("a[rel=tooltip]").tooltip()
|
||||
7
app/assets/javascripts/bootstrap.min.js
vendored
7
app/assets/javascripts/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
|
|
@ -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/
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
*= require bootstrap.min
|
||||
*= require strap-on.css.scss
|
||||
*= require formtastic-bootstrap
|
||||
*= require osem
|
||||
*= require jquery-ui-1.9.2.custom
|
||||
|
|
|
|||
868
app/assets/stylesheets/bootstrap.min.css
vendored
868
app/assets/stylesheets/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -1,34 +1,43 @@
|
|||
html, body,.container,.content {
|
||||
/* Sticky footer styles
|
||||
-------------------------------------------------- */
|
||||
html,
|
||||
body {
|
||||
height: 100%;
|
||||
/* The html and body elements cannot have any padding or margin. */
|
||||
}
|
||||
|
||||
#push,
|
||||
#footer {
|
||||
height: 60px;
|
||||
}
|
||||
|
||||
.well {
|
||||
background-color: white;
|
||||
border: 1px solid #299A0B;
|
||||
}
|
||||
.container, .content {
|
||||
position: relative;
|
||||
}
|
||||
#inner-content {
|
||||
padding-top: 60px;
|
||||
}
|
||||
|
||||
/* Wrapper for page content to push down footer */
|
||||
#wrap {
|
||||
min-height: 100%;
|
||||
height: auto !important;
|
||||
height: 100%;
|
||||
/* Negative indent footer by it's height */
|
||||
margin: 0 auto -60px;
|
||||
}
|
||||
|
||||
/* Set the fixed height of the footer here */
|
||||
#push,
|
||||
#footer {
|
||||
position: relative;
|
||||
background-color: #ffffff;
|
||||
height: 60px;
|
||||
}
|
||||
#footer {
|
||||
background-color: #f5f5f5;
|
||||
}
|
||||
|
||||
/* Lastly, apply responsive CSS fixes as necessary */
|
||||
@media (max-width: 767px) {
|
||||
#footer {
|
||||
margin-left: -20px;
|
||||
margin-right: -20px;
|
||||
padding-left: 20px;
|
||||
padding-right: 20px;
|
||||
}
|
||||
}
|
||||
|
||||
.container#messages {
|
||||
padding-top: 60px;
|
||||
}
|
||||
|
||||
.navbar-inner {
|
||||
background: #299a0b; /* Old browsers */
|
||||
background: -moz-linear-gradient(top, #299a0b 0%, #299a0b 100%); /* FF3.6+ */
|
||||
|
|
@ -67,10 +76,6 @@ html, body,.container,.content {
|
|||
float:none;
|
||||
}
|
||||
|
||||
.center-text {
|
||||
text-align: center
|
||||
}
|
||||
|
||||
textarea {
|
||||
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
|
||||
-moz-box-sizing: border-box; /* Firefox, other Gecko */
|
||||
|
|
|
|||
2
app/assets/stylesheets/strap-on.css.scss
Normal file
2
app/assets/stylesheets/strap-on.css.scss
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
@import "bootstrap";
|
||||
@import "bootstrap-responsive";
|
||||
Loading…
Add table
Add a link
Reference in a new issue