Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
94
Merge Requests
10
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
ea14f0c3
authored
Sep 16, 2014
by
Kálmán Viktor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
circle: use less to compile css
Also compile bootstrap
parent
2a586b91
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
64 additions
and
45 deletions
+64
-45
.gitignore
+3
-0
circle/circle/settings/base.py
+6
-5
circle/dashboard/static/compile_bootstrap.less
+55
-0
circle/dashboard/static/dashboard/dashboard.less
+0
-0
circle/dashboard/static/template.less
+0
-40
circle/network/static/network/network.less
+0
-0
No files found.
.gitignore
View file @
ea14f0c3
...
@@ -39,3 +39,6 @@ circle/bower_components
...
@@ -39,3 +39,6 @@ circle/bower_components
# jsi18n files
# jsi18n files
jsi18n
jsi18n
# less
*.css
circle/circle/settings/base.py
View file @
ea14f0c3
...
@@ -175,16 +175,17 @@ PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
...
@@ -175,16 +175,17 @@ PIPELINE_CSS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
# PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
# PIPELINE_JS_COMPRESSOR = 'pipeline.compressors.yuglify.YuglifyCompressor'
PIPELINE_JS_COMPRESSOR
=
None
# js compressors don't really like our deps
PIPELINE_JS_COMPRESSOR
=
None
# js compressors don't really like our deps
PIPELINE_DISABLE_WRAPPER
=
True
PIPELINE_DISABLE_WRAPPER
=
True
PIPELINE_LESS_ARGUMENTS
=
u'--include-path={}'
.
format
(
':'
.
join
(
STATICFILES_DIRS
))
PIPELINE_CSS
=
{
PIPELINE_CSS
=
{
"all"
:
{
"source_filenames"
:
(
"all"
:
{
"source_filenames"
:
(
"bootstrap/dist/css/bootstrap.css"
,
"bootstrap/dist/css/bootstrap-theme.css"
,
"fontawesome/css/font-awesome.css"
,
"fontawesome/css/font-awesome.css"
,
"jquery-simple-slider/css/simple-slider.css"
,
"jquery-simple-slider/css/simple-slider.css"
,
"bootstrap-tour/build/css/bootstrap-tour.css"
,
"bootstrap-tour/build/css/bootstrap-tour.css"
,
"template.css"
,
"template.less"
,
"dashboard/dashboard.css"
,
"dashboard/dashboard.less"
,
"network/network.css"
,
"network/network.less"
,
"compile_bootstrap.less"
,
"bootstrap/dist/css/bootstrap-theme.css"
,
),
),
"output_filename"
:
"all.css"
,
"output_filename"
:
"all.css"
,
}
}
...
...
circle/dashboard/static/compile_bootstrap.less
0 → 100644
View file @
ea14f0c3
// Core variables and mixins
@import "bootstrap/less/variables.less";
// Custom variables
@navbar-height: 45px;
@import "bootstrap/less/mixins.less";
// Reset and dependencies
@import "bootstrap/less/normalize.less";
@import "bootstrap/less/print.less";
// we don't use these, also they make collectstatic fail ...
// @import "bootstrap/less/glyphicons.less";
// Core CSS
@import "bootstrap/less/scaffolding.less";
@import "bootstrap/less/type.less";
@import "bootstrap/less/code.less";
@import "bootstrap/less/grid.less";
@import "bootstrap/less/tables.less";
@import "bootstrap/less/forms.less";
@import "bootstrap/less/buttons.less";
// Components
@import "bootstrap/less/component-animations.less";
@import "bootstrap/less/dropdowns.less";
@import "bootstrap/less/button-groups.less";
@import "bootstrap/less/input-groups.less";
@import "bootstrap/less/navs.less";
@import "bootstrap/less/navbar.less";
@import "bootstrap/less/breadcrumbs.less";
@import "bootstrap/less/pagination.less";
@import "bootstrap/less/pager.less";
@import "bootstrap/less/labels.less";
@import "bootstrap/less/badges.less";
@import "bootstrap/less/jumbotron.less";
@import "bootstrap/less/thumbnails.less";
@import "bootstrap/less/alerts.less";
@import "bootstrap/less/progress-bars.less";
@import "bootstrap/less/media.less";
@import "bootstrap/less/list-group.less";
@import "bootstrap/less/panels.less";
@import "bootstrap/less/responsive-embed.less";
@import "bootstrap/less/wells.less";
@import "bootstrap/less/close.less";
// Components w/ JavaScript
@import "bootstrap/less/modals.less";
@import "bootstrap/less/tooltip.less";
@import "bootstrap/less/popovers.less";
@import "bootstrap/less/carousel.less";
// Utility classes
@import "bootstrap/less/utilities.less";
@import "bootstrap/less/responsive-utilities.less";
circle/dashboard/static/dashboard/dashboard.
c
ss
→
circle/dashboard/static/dashboard/dashboard.
le
ss
View file @
ea14f0c3
File moved
circle/dashboard/static/template.
c
ss
→
circle/dashboard/static/template.
le
ss
View file @
ea14f0c3
...
@@ -23,46 +23,6 @@ html {
...
@@ -23,46 +23,6 @@ html {
padding-right: 15px;
padding-right: 15px;
}
}
/* values for 45px tall navbar */
.navbar
{
min-height
:
45px
;
}
.navbar-brand
{
height
:
45px
;
padding
:
12.5px
12.5px
;
}
.navbar-toggle
{
margin-top
:
5.5px
;
margin-bottom
:
5.5px
;
}
.navbar-form
{
margin-top
:
5.5px
;
margin-bottom
:
5.5px
;
}
.navbar-btn
{
margin-top
:
5.5px
;
margin-bottom
:
5.5px
;
}
.navbar-btn.btn-sm
{
margin-top
:
7.5px
;
margin-bottom
:
7.5px
;
}
.navbar-btn.btn-xs
{
margin-top
:
11.5px
;
margin-bottom
:
11.5px
;
}
.navbar-text
{
margin-top
:
12.5px
;
margin-bottom
:
12.5px
;
}
/* --- */
/* Responsive: Portrait tablets and up */
/* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) {
@media screen and (min-width: 768px) {
/* Let the jumbotron breathe */
/* Let the jumbotron breathe */
...
...
circle/network/static/network/network.
c
ss
→
circle/network/static/network/network.
le
ss
View file @
ea14f0c3
File moved
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