Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
4f3d7048
Commit
4f3d7048
authored
9 years ago
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move mixins and bootstrap css to base directory
parent
433b4c76
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
3 deletions
+7
-3
app/assets/stylesheets/application.scss
app/assets/stylesheets/application.scss
+7
-2
app/assets/stylesheets/base/gl_bootstrap.scss
app/assets/stylesheets/base/gl_bootstrap.scss
+0
-1
app/assets/stylesheets/base/gl_variables.scss
app/assets/stylesheets/base/gl_variables.scss
+0
-0
app/assets/stylesheets/base/layout.scss
app/assets/stylesheets/base/layout.scss
+0
-0
app/assets/stylesheets/base/mixins.scss
app/assets/stylesheets/base/mixins.scss
+0
-0
app/assets/stylesheets/base/variables.scss
app/assets/stylesheets/base/variables.scss
+0
-0
No files found.
app/assets/stylesheets/application.scss
View file @
4f3d7048
...
...
@@ -11,12 +11,17 @@
*= require cal-heatmap
*/
@import
"main/*"
;
@import
"base/variables"
;
@import
"base/mixins"
;
@import
"base/layout"
;
/**
* Customized Twitter bootstrap
*/
@import
'gl_bootstrap'
;
@import
'base/gl_variables'
;
@import
'base/gl_bootstrap'
;
/**
* NProgress load bar css
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/gl_bootstrap.scss
→
app/assets/stylesheets/
base/
gl_bootstrap.scss
View file @
4f3d7048
...
...
@@ -2,7 +2,6 @@
* Twitter bootstrap with GitLab customizations/additions
*
*/
@import
"gl_variables"
;
// Core variables and mixins
@import
"bootstrap/variables"
;
...
...
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/gl_variables.scss
→
app/assets/stylesheets/
base/
gl_variables.scss
View file @
4f3d7048
File moved
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/
main
/layout.scss
→
app/assets/stylesheets/
base
/layout.scss
View file @
4f3d7048
File moved
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/
main
/mixins.scss
→
app/assets/stylesheets/
base
/mixins.scss
View file @
4f3d7048
File moved
This diff is collapsed.
Click to expand it.
app/assets/stylesheets/
main
/variables.scss
→
app/assets/stylesheets/
base
/variables.scss
View file @
4f3d7048
File moved
This diff is collapsed.
Click to expand it.
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