Skip to content

Commit 8a6cb89

Browse files
bicpibicpi
committed
implement bootstrap-sass; cleanup
1 parent 99ffdc7 commit 8a6cb89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+6193
-455
lines changed

‎ansible/roles/app/tasks/main.yml

+3
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
- name: Run bower
1010
sudo: false
1111
shell: /usr/local/bin/bower install chdir={{ project_root }}
12+
- name: Run gulp
13+
sudo: false
14+
shell: /usr/local/bin/gulp chdir={{ project_root }}
1215
- name: Copy parameters.yml file
1316
sudo: false
1417
template: src=parameters.tpl dest={{project_root}}/src/App/Resources/config/parameters.yml mode=644

‎bower.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
],
77
"dependencies": {
88
"jquery": "~1.9.1",
9-
"font-awesome": "~3.2.1",
10-
"bootstrap-sass": "v2.3.2.2"
9+
"font-awesome": "~3.2.1"
1110
}
1211
}

‎gulpfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ gulp.task('styles', function() {
8686
var pipeline = new Pipeline();
8787

8888
pipeline.add([
89-
config.assetsDir+'/css/bootstrap.less',
89+
config.assetsDir+'/css/bootstrap.scss',
9090
config.bowerDir+'/font-awesome/css/font-awesome.css',
9191
config.assetsDir+'/css/styles.scss'
9292
], 'main.css');

‎src/App/Resources/assets/css/bootstrap.scss

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
/* import bootstrap components from bootstrap-dedicated folder */
2-
@import "../../../vendor/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap";
3-
@import "../../../vendor/bower_components/bootstrap-sass/vendor/assets/stylesheets/bootstrap-responsive";
4-
51
/* custom settings that deviate from Bootstrap's default values */
62
$sansFontFamily: "Trebuchet MS", Tahoma, sans-serif, Arial;
73
$baseLineHeight: 18px;
84
$navbarBackground: #E9F2F9;
95
$navbarText: #407AB1;
106
$navbarLinkColor: #407AB1;
117
$heroUnitBackground: #BEDCF4;
8+
$iconSpritePath: "../img/glyphicons-halflings.png";
9+
$iconWhiteSpritePath: "../img/glyphicons-halflings-white.png";
10+
11+
/* import bootstrap components from bootstrap-dedicated folder */
12+
@import "bootstrap/bootstrap";
13+
@import "bootstrap/responsive";

‎src/App/Resources/assets/css/bootstrap/_accordion.scss

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
//
2+
// Accordion
3+
// --------------------------------------------------
4+
5+
6+
// Parent container
7+
.accordion {
8+
margin-bottom: $baseLineHeight;
9+
}
10+
11+
// Group == heading + body
12+
.accordion-group {
13+
margin-bottom: 2px;
14+
border: 1px solid #e5e5e5;
15+
@include border-radius($baseBorderRadius);
16+
}
17+
.accordion-heading {
18+
border-bottom: 0;
19+
}
20+
.accordion-heading .accordion-toggle {
21+
display: block;
22+
padding: 8px 15px;
23+
}
24+
25+
// General toggle styles
26+
.accordion-toggle {
27+
cursor: pointer;
28+
}
29+
30+
// Inner needs the styles because you can't animate properly with any styles on the element
31+
.accordion-inner {
32+
padding: 9px 15px;
33+
border-top: 1px solid #e5e5e5;
34+
}

‎src/App/Resources/assets/css/bootstrap/_alerts.scss

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
//
2+
// Alerts
3+
// --------------------------------------------------
4+
5+
6+
// Base styles
7+
// -------------------------
8+
9+
.alert {
10+
padding: 8px 35px 8px 14px;
11+
margin-bottom: $baseLineHeight;
12+
text-shadow: 0 1px 0 rgba(255,255,255,.5);
13+
background-color: $warningBackground;
14+
border: 1px solid $warningBorder;
15+
@include border-radius($baseBorderRadius);
16+
}
17+
.alert,
18+
.alert h4 {
19+
// Specified for the h4 to prevent conflicts of changing $headingsColor
20+
color: $warningText;
21+
}
22+
.alert h4 {
23+
margin: 0;
24+
}
25+
26+
// Adjust close link position
27+
.alert .close {
28+
position: relative;
29+
top: -2px;
30+
right: -21px;
31+
line-height: $baseLineHeight;
32+
}
33+
34+
35+
// Alternate styles
36+
// -------------------------
37+
38+
.alert-success {
39+
background-color: $successBackground;
40+
border-color: $successBorder;
41+
color: $successText;
42+
}
43+
.alert-success h4 {
44+
color: $successText;
45+
}
46+
.alert-danger,
47+
.alert-error {
48+
background-color: $errorBackground;
49+
border-color: $errorBorder;
50+
color: $errorText;
51+
}
52+
.alert-danger h4,
53+
.alert-error h4 {
54+
color: $errorText;
55+
}
56+
.alert-info {
57+
background-color: $infoBackground;
58+
border-color: $infoBorder;
59+
color: $infoText;
60+
}
61+
.alert-info h4 {
62+
color: $infoText;
63+
}
64+
65+
66+
// Block alerts
67+
// -------------------------
68+
69+
.alert-block {
70+
padding-top: 14px;
71+
padding-bottom: 14px;
72+
}
73+
.alert-block > p,
74+
.alert-block > ul {
75+
margin-bottom: 0;
76+
}
77+
.alert-block p + p {
78+
margin-top: 5px;
79+
}

‎src/App/Resources/assets/css/bootstrap/_breadcrumbs.scss

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//
2+
// Breadcrumbs
3+
// --------------------------------------------------
4+
5+
6+
.breadcrumb {
7+
padding: 8px 15px;
8+
margin: 0 0 $baseLineHeight;
9+
list-style: none;
10+
background-color: #f5f5f5;
11+
@include border-radius($baseBorderRadius);
12+
> li {
13+
display: inline-block;
14+
@include ie7-inline-block();
15+
text-shadow: 0 1px 0 $white;
16+
> .divider {
17+
padding: 0 5px;
18+
color: #ccc;
19+
}
20+
}
21+
.active {
22+
color: $grayLight;
23+
}
24+
}

0 commit comments

Comments
 (0)