BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
da587351
Unverified
Commit
da587351
authored
Dec 31, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor scss pt3
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
da41efcf
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
10 additions
and
5 deletions
+10
-5
application.scss
app/assets/stylesheets/application.scss
+7
-2
generic.scss
app/assets/stylesheets/generic.scss
+0
-3
fonts.scss
app/assets/stylesheets/main/fonts.scss
+0
-0
mixins.scss
app/assets/stylesheets/main/mixins.scss
+0
-0
variables.scss
app/assets/stylesheets/main/variables.scss
+3
-0
No files found.
app/assets/stylesheets/application.scss
View file @
da587351
...
...
@@ -9,8 +9,9 @@
*= require_self
*/
/** Override bootstrap variables **/
$font-size-base
:
13px
!
default
;
@import
"main/variables.scss"
;
@import
"main/mixins.scss"
;
@import
"main/fonts.scss"
;
/**
* Twitter bootstrap:
...
...
@@ -28,6 +29,10 @@ $font-size-base: 13px !default;
*/
@import
"generic.scss"
;
/**
* Unrefactored css
*/
@import
"common.scss"
;
...
...
app/assets/stylesheets/generic.scss
View file @
da587351
@import
"generic/variables.scss"
;
@import
"generic/fonts.scss"
;
@import
"generic/mixins.scss"
;
@import
"generic/avatar.scss"
;
@import
"generic/nav.scss"
;
@import
"generic/common.scss"
;
...
...
app/assets/stylesheets/
generic
/fonts.scss
→
app/assets/stylesheets/
main
/fonts.scss
View file @
da587351
File moved
app/assets/stylesheets/
generic
/mixins.scss
→
app/assets/stylesheets/
main
/mixins.scss
View file @
da587351
File moved
app/assets/stylesheets/
generic
/variables.scss
→
app/assets/stylesheets/
main
/variables.scss
View file @
da587351
/** Override bootstrap variables **/
$font-size-base
:
13px
!
default
;
/**
* General Colors
*/
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment