Skip to content

Commit 0b4b091

Browse files
dominicdominic
committed
removed blank scss files, added sass-converted bootstrap, refactored css dependencies
1 parent 95c8de0 commit 0b4b091

21 files changed

Lines changed: 2187 additions & 19 deletions

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ db/*.sqlite3
33
log/*.log
44
tmp/
55
.sass-cache/
6-
*.rbc
6+
*.rbc
7+
.DS_Store

‎app/assets/images/logo-star.png‎

12.1 KB
Loading

‎app/assets/images/rails.png‎

-6.49 KB
Binary file not shown.

‎app/assets/stylesheets/answers.css.scss‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎app/assets/stylesheets/api/rels.css.scss‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/stylesheets/application.css renamed to app/assets/stylesheets/application.css.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22
* This is a manifest file that'll automatically include all the stylesheets available in this directory
33
* and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
44
* the top of the compiled file, but it's generally better to create a new file per style scope.
5+
*
6+
*= require "lib/bootstrap/bootstrap"
57
*= require_self
6-
*= require_tree .
7-
*/
8+
*/
9+
10+
/* We're doing our manifest file a little differently to work with bootstrap... */
11+
@import "lib/shared.css.scss";
12+
@import "layout.css.scss";
13+
@import "forms.css.scss";
14+
@import "content.css.scss"

app/assets/stylesheets/scaffolds.css.scss renamed to app/assets/stylesheets/content.css.scss

File renamed without changes.

‎app/assets/stylesheets/layout.css.scss‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
11
body {
2-
padding-top: 50px;
2+
padding-top: 105px;
3+
}
4+
5+
header .topbar-inner {
6+
padding: 1em 0;
7+
li a {
8+
border-radius: 8px;
9+
}
10+
}
11+
12+
#logo {
13+
float: left;
14+
width: 97px;
15+
height: 40px;
16+
}
17+
18+
#logo a {
19+
position: absolute;
20+
padding: 0;
21+
top: -7px;
22+
width: 97px;
23+
height: 90px;
24+
display: block;
25+
background: url('/assets/logo-star.png') no-repeat;
26+
text-indent: -9999px;
327
}

‎app/assets/stylesheets/lib/bootstrap/adaptive.scss‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/* Responsive.less
2+
* Adjusted grid styles to handle some common screen sizes
3+
* ------------------------------------------------------- */
4+
5+
6+
// MOBILE PORTRAIT & LANDSCAPE
7+
// ---------------------------
8+
// For devices narrower than 480px
9+
@media only screen and (max-width: 480px) {
10+
11+
// Remove fixed width of containers
12+
.container {
13+
width: auto;
14+
padding: 0 10px;
15+
}
16+
17+
// Undo the floating of columns
18+
.row {
19+
margin-left: 0;
20+
}
21+
.row [class^="span"] {
22+
float: none;
23+
width: 100%;
24+
display: block;
25+
margin-left: 0;
26+
}
27+
28+
// Stack form elements instead of floating them
29+
fieldset legend {
30+
margin-left: 0;
31+
}
32+
label {
33+
float: none;
34+
width: auto;
35+
text-align: left;
36+
}
37+
div.input {
38+
margin-left: 0;
39+
width: 100%;
40+
}
41+
.input-xxlarge,
42+
input.xxlarge,
43+
textarea.xxlarge,
44+
select.xxlarge {
45+
width: 80%;
46+
}
47+
48+
// Adjust modal
49+
.modal-backdrop {
50+
padding: 10px;
51+
}
52+
.modal {
53+
width: 100%;
54+
margin: 0;
55+
left: auto;
56+
}
57+
}

‎app/assets/stylesheets/lib/bootstrap/bootstrap.scss‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/*!
2+
* Bootstrap @VERSION
3+
*
4+
* Copyright 2011 Twitter, Inc
5+
* Licensed under the Apache License v2.0
6+
* http://www.apache.org/licenses/LICENSE-2.0
7+
*
8+
* Designed and built with all the love in the world @twitter by @mdo and @fat.
9+
* Date: @DATE
10+
*/
11+
12+
// CSS Reset
13+
@import "reset.scss";
14+
15+
// Core
16+
@import "preboot.scss";
17+
@import "scaffolding.scss";
18+
19+
// Styled patterns and elements
20+
@import "type.scss";
21+
@import "forms.scss";
22+
@import "tables.scss";
23+
@import "patterns.scss";

0 commit comments

Comments
 (0)