developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'design_team' into ldap

Browse Source 
Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json
This commit is contained in:
Christophe Vilayphiou committed 2012-05-14 00:57:17 +08:00
2 parents 5eba2638ce 039e837fff
commit ebc8dd33ec
108 files changed
+1148 -619
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/assets/stylesheets/sidebar.css.erb
+29 -4
View File
@@ -6,13 +6,14 @@
.nav-list li {
position: relative;
}
.nav-list ul {
margin-left: 10px;
.nav-list ol {
margin-left: 20px;
}
.nav-list ul li {
.nav-list ol li {
padding: 5px 0;
list-style: none;
}
.nav-list ul li a {
.nav-list ol li a {
font-size: 13px;
padding: 3px 0px;
display: block;
@@ -148,4 +149,28 @@
}
#main-sidebar .quick-edit a:hover {
background-color: #DDDDDD;
}
ol.nav>li>.icons-moves {
display: none;
}
.sortable i {
position: absolute;
left: -20px;
top: 6px;
margin-right: 0;
opacity: 0.3;
filter: alpha(opacity=30);
}
.sortable i:hover {
cursor:move;
opacity: 0.7;
filter: alpha(opacity=70);
}
.placeholder {
background-color: rgba(0,136,204,.6);
border-radius: 3px;
}
.ui-nestedSortable-error {
background: rgba(255,206,206,.6);
color: #8a1f11;
}
app/assets/stylesheets/style.css.erb
+81 -5
View File
@@ -110,10 +110,8 @@
padding:6px;
}
#orbit-bar .nav > li.search {
background-image: none;
overflow: hidden;
width: 28px;
margin-bottom: 0;
position: relative;
}
#orbit-bar .nav > li > a.orbit-bar-home {
@@ -685,6 +683,33 @@
#banner [id^="slideshow-"] {
z-index: 2 !important;
}
#back_main .editable {
position: relative;
}
#back_main .editable:after {
content: '';
clear: both;
display: block;
visibility: hidden;
height: 0;
}
#back_main .edit_link a {
position: absolute;
z-index: 10;
width: 100%;
height: 100%;
top: 0;
left: 0;
text-indent: -9999px;
background: url(<%= asset_path 'editicon.png' %>) no-repeat center center rgba(255,255,255,.8);
-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1);
}
[class^="icons-"] {
display: inline-block;
width: 16px;
@@ -1243,12 +1268,63 @@
.icons-plus {
background-position: -288px -576px;
}
/*20*/
.icons-power {
background-position: -0px -608px;
}
/*20*/
.icons- {
background-position: -0px -608px;
.icons-output {
background-position: -32px -608px;
}
.icons-col-resize {
background-position: -64px -608px;
}
.icons-move {
background-position: -96px -608px;
}
.icons-size-out {
background-position: -128px -608px;
}
.icons-size-in {
background-position: -160px -608px;
}
.icons-slash {
background-position: -192px -608px;
}
.icons-level {
background-position: -224px -608px;
}
.icons-share {
background-position: -256px -608px;
}
.icons-share2 {
background-position: -288px -608px;
}
.icons-re {
background-position: -320px -608px;
}
.icons-insert {
background-position: -352px -608px;
}
.icons-insert2 {
background-position: -384px -608px;
}
.icons-download {
background-position: -416px -608px;
}
.icons-tag-rignt {
background-position: -448px -608px;
}
.icons-tag-top {
background-position: -480px -608px;
}
.icons-tag-bottom {
background-position: -512px -608px;
}
.icons-tag-left {
background-position: -544px -608px;
}
.icons-moves {
background-position: -576px -608px;
}
/*21*/
.icons- {