Skip to content
Extraits de code Groupes Projets
Valider acf823ff rédigé par Steven Hancock's avatar Steven Hancock
Parcourir les fichiers

bootstrap-sass fixes

* Update interim-bootstrap to use the partials from bootstrap-sass,
since some of the names have been changed (and we're using the
Bootstrap 2 javascript now). This should make it easy to keep the
file up to date with the version of Bootstrap we're using.
* Use interim-bootstrap instead of bootstrap-complete in default.css to
avoid the little problem I ran into with Bootstrap + Blueprint grids
not getting along. :)
* Revert the CSS class change (from .span-24.last to .row) in
layouts/application since interim-bootstrap works around that problem.
* Get rid of .icon-black since it's not needed.
* Remove the 60px padding on the page body since it isn't needed and
causes problems with the single post view.
parent 021cc994
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
// Calling this file bootstrap would cause an infinite recursion during asset compilation.
@import 'bootstrap';
// Add padding to the top of the page to prevent navbar overlap (see Bootstrap docs).
// Adjust as needed, minimum 40px
body { padding-top: 60px; }
@import 'bootstrap-responsive';
\ No newline at end of file
......@@ -7,7 +7,7 @@
*= require tags
*= require hovercard
*= require bootstrap-complete
*= require vendor/interim-bootstrap
*= require vendor/facebox
*= require vendor/fileuploader
*= require vendor/autoSuggest
......
@import "_new_mixins";
/* bootstrap extentions and overrides for asset pipeline
* The glyphicons-halflings and glyphicons-halflings-white sprites are included in
* bootstrap-sass.
*/
.icon-black { background-image: image_url("glyphicons-halflings.png") }
/* bootstrap extentions */
.icon-red { background-image: image_url("img/glyphicons-halflings-red.png"); }
.icon-green { background-image: image_url("img/glyphicons-halflings-green.png"); }
.icon-blue { background-image: image_url("img/glyphicons-halflings-blue.png"); }
......
.twipsy {
display: block;
position: absolute;
visibility: visible;
padding: 5px;
font-size: 11px;
z-index: 1000;
filter: alpha(opacity=80);
-khtml-opacity: 0.8;
-moz-opacity: 0.8;
opacity: 0.8;
}
.twipsy.fade.in {
filter: alpha(opacity=80);
-khtml-opacity: 0.8;
-moz-opacity: 0.8;
opacity: 0.8;
}
.twipsy.above .twipsy-arrow {
bottom: 0;
left: 50%;
margin-left: -5px;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-top: 5px solid #000000;
}
.twipsy.left .twipsy-arrow {
top: 50%;
right: 0;
margin-top: -5px;
border-top: 5px solid transparent;
border-bottom: 5px solid transparent;
border-left: 5px solid #000000;
}
.twipsy.below .twipsy-arrow {
top: 0;
left: 50%;
margin-left: -5px;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-bottom: 5px solid #000000;
}
.twipsy.right .twipsy-arrow {
top: 50%;
left: 0;
margin-top: -5px;
border-top: 5px solid transparent;
border-bottom: 5px solid transparent;
border-right: 5px solid #000000;
}
.twipsy-inner {
padding: 3px 8px;
background-color: #000000;
color: white;
text-align: center;
max-width: 200px;
text-decoration: none;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.twipsy-arrow {
position: absolute;
width: 0;
height: 0;
}
.popover {
position: absolute;
top: 0;
left: 0;
z-index: 1000;
padding: 5px;
display: none;
}
.popover.above .arrow {
bottom: 0;
left: 50%;
margin-left: -5px;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-top: 5px solid #000000;
}
.popover.right .arrow {
top: 50%;
left: 0;
margin-top: -5px;
border-top: 5px solid transparent;
border-bottom: 5px solid transparent;
border-right: 5px solid #000000;
}
.popover.below .arrow {
top: 0;
left: 50%;
margin-left: -5px;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
border-bottom: 5px solid #000000;
}
.popover.left .arrow {
top: 50%;
right: 0;
margin-top: -5px;
border-top: 5px solid transparent;
border-bottom: 5px solid transparent;
border-left: 5px solid #000000;
}
.popover .arrow {
position: absolute;
width: 0;
height: 0;
}
.popover .inner {
background-color: #000000;
background-color: rgba(0, 0, 0, 0.8);
padding: 3px;
overflow: hidden;
width: 280px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
-webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
-moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
}
.popover .title {
background-color: #f5f5f5;
padding: 9px 15px;
line-height: 1;
-webkit-border-radius: 3px 3px 0 0;
-moz-border-radius: 3px 3px 0 0;
border-radius: 3px 3px 0 0;
border-bottom: 1px solid #eee;
}
.popover .content {
background-color: #ffffff;
padding: 14px;
-webkit-border-radius: 0 0 3px 3px;
-moz-border-radius: 0 0 3px 3px;
border-radius: 0 0 3px 3px;
-webkit-background-clip: padding-box;
-moz-background-clip: padding-box;
background-clip: padding-box;
}
.popover .content p, .popover .content ul, .popover .content ol {
margin-bottom: 0;
}
.fade {
-webkit-transition: opacity 0.15s linear;
-moz-transition: opacity 0.15s linear;
-ms-transition: opacity 0.15s linear;
-o-transition: opacity 0.15s linear;
transition: opacity 0.15s linear;
opacity: 0;
}
.fade.in {
opacity: 1;
}
/* hacks */
.popover h3 {
margin-bottom: 0;
font-weight: bold;
}
// Load the necessary styles from the bootstrap-sass partials to keep this file
// up to date with the version of Bootstrap we're using.
@import "bootstrap/mixins";
@import "bootstrap/variables";
@import "bootstrap/tooltip";
@import "bootstrap/popovers";
@import "bootstrap/component-animations";
/* hacks */
.popover h3 {
margin-bottom: 0;
font-weight: bold;
}
......@@ -54,7 +54,7 @@
- if @aspect == :getting_started || @page == :logged_out
= yield
- else
.row
.span-24.last
= yield
- unless @landing_page
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter