Skip to content

CIRCLE3 / cloud

Go to a project
Commit 7dc0aee0 by Szeberényi Imre
Options

Merge branch 'ci-integration' into 'master' 

fix errors to master branch salt install

See merge request !10
parents 28a36f5d 14291839
Showing with 15 additions and 13 deletions
.gitignore
...@@ -44,6 +44,6 @@ circle/bower_components ...@@ -44,6 +44,6 @@ circle/bower_components
jsi18n jsi18n
scripts.rc scripts.rc
# less # les
# *.css *.css
circle/dashboard/static/compile_bootstrap.css circle/dashboard/static/compile_bootstrap.css
circle/dashboard/static/dashboard/dashboard.css
...@@ -1365,14 +1365,4 @@ textarea[name="new_members"] { ...@@ -1365,14 +1365,4 @@ textarea[name="new_members"] {
margin-right: 8px; margin-right: 8px;
} }
#ace-meta-data {
position: absolute;
width: 95%;
height: 150px;
}
#ace-user-data {
position: absolute;
width: 95%;
height: 350px;
}
\ No newline at end of file
circle/dashboard/static/dashboard/dashboard.less
...@@ -1596,3 +1596,15 @@ textarea[name="new_members"] { ...@@ -1596,3 +1596,15 @@ textarea[name="new_members"] {
} }
} }
} }
#ace-meta-data {
position: absolute;
width: 95%;
height: 150px;
}
#ace-user-data {
position: absolute;
width: 95%;
height: 350px;
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment