浏览代码

Ticket #1317 - Core changes.

AntonLV 8 年之前
父节点
当前提交
95b6d8a117

+ 31 - 26
modules/boonex/decorous/data/template/system/css/default.less

@@ -34,46 +34,51 @@ html.bx-media-phone {
 
 /* shadow */
 .bx-shadow-header {
-	-webkit-box-shadow: @bx-shadow-header;
-	-moz-box-shadow: @bx-shadow-header;
-	box-shadow: @bx-shadow-header;
+    -webkit-box-shadow: @bx-shadow-header;
+    -moz-box-shadow: @bx-shadow-header;
+    box-shadow: @bx-shadow-header;
 }
 .bx-shadow-footer {
-	-webkit-box-shadow: @bx-shadow-footer;
-	-moz-box-shadow: @bx-shadow-footer;
-	box-shadow: @bx-shadow-footer;
+    -webkit-box-shadow: @bx-shadow-footer;
+    -moz-box-shadow: @bx-shadow-footer;
+    box-shadow: @bx-shadow-footer;
 }
 .bx-shadow-block {
-	-webkit-box-shadow: @bx-shadow-block;
-	-moz-box-shadow: @bx-shadow-block;
-	box-shadow: @bx-shadow-block;
+    -webkit-box-shadow: @bx-shadow-block;
+    -moz-box-shadow: @bx-shadow-block;
+    box-shadow: @bx-shadow-block;
 }
 .bx-def-box {
-	-webkit-box-shadow: @bx-shadow-card;
-	-moz-box-shadow: @bx-shadow-card;
-	box-shadow: @bx-shadow-card;
+    -webkit-box-shadow: @bx-shadow-card;
+    -moz-box-shadow: @bx-shadow-card;
+    box-shadow: @bx-shadow-card;
 }
 .bx-popup-applied {
-	.radius(@bx-border-radius-popup);
-
-	-webkit-box-shadow: @bx-shadow-popup;
-	-moz-box-shadow: @bx-shadow-popup;
-	box-shadow: @bx-shadow-popup;
+    .radius(@bx-border-radius-popup);
+}
+.bx-popup-applied:not(.bx-popup-chain),
+.bx-popup-applied.bx-popup-chain .bx-popup-chain-item {
+    -webkit-box-shadow: @bx-shadow-popup;
+    -moz-box-shadow: @bx-shadow-popup;
+    box-shadow: @bx-shadow-popup;
+}
+.bx-popup-applied.bx-popup-chain .bx-popup-chain-item a:hover {
+    background-color: @bx-color-hl;
 }
 .bx-popup-wrapper.bx-popup-slide-wrapper {
-	-webkit-box-shadow: @bx-shadow-menu-slide;
-	-moz-box-shadow: @bx-shadow-menu-slide;
-	box-shadow: @bx-shadow-menu-slide;
+    -webkit-box-shadow: @bx-shadow-menu-slide;
+    -moz-box-shadow: @bx-shadow-menu-slide;
+    box-shadow: @bx-shadow-menu-slide;
 }
 .bx-btn {
-	-webkit-box-shadow: @bx-shadow-button;
-	-moz-box-shadow: @bx-shadow-button;
-	box-shadow: @bx-shadow-button;
+    -webkit-box-shadow: @bx-shadow-button;
+    -moz-box-shadow: @bx-shadow-button;
+    box-shadow: @bx-shadow-button;
 }
 .bx-btn.bx-btn-small {
-	-webkit-box-shadow: @bx-shadow-button-small;
-	-moz-box-shadow: @bx-shadow-button-small;
-	box-shadow: @bx-shadow-button-small;
+    -webkit-box-shadow: @bx-shadow-button-small;
+    -moz-box-shadow: @bx-shadow-button-small;
+    box-shadow: @bx-shadow-button-small;
 }
 
 

+ 32 - 27
modules/boonex/protean/data/template/system/css/default.less

@@ -34,47 +34,52 @@ html.bx-media-phone {
 
 /* shadow */
 .bx-shadow-header {
-	-webkit-box-shadow: @bx-shadow-header;
-	-moz-box-shadow: @bx-shadow-header;
-	box-shadow: @bx-shadow-header;
+    -webkit-box-shadow: @bx-shadow-header;
+    -moz-box-shadow: @bx-shadow-header;
+    box-shadow: @bx-shadow-header;
 }
 .bx-shadow-footer {
-	-webkit-box-shadow: @bx-shadow-footer;
-	-moz-box-shadow: @bx-shadow-footer;
-	box-shadow: @bx-shadow-footer;
+    -webkit-box-shadow: @bx-shadow-footer;
+    -moz-box-shadow: @bx-shadow-footer;
+    box-shadow: @bx-shadow-footer;
 }
 .bx-shadow-block {
-	-webkit-box-shadow: @bx-shadow-block;
-	-moz-box-shadow: @bx-shadow-block;
-	box-shadow: @bx-shadow-block;
+    -webkit-box-shadow: @bx-shadow-block;
+    -moz-box-shadow: @bx-shadow-block;
+    box-shadow: @bx-shadow-block;
 }
 .bx-def-box {
-	-webkit-box-shadow: @bx-shadow-card;
-	-moz-box-shadow: @bx-shadow-card;
-	box-shadow: @bx-shadow-card;
+    -webkit-box-shadow: @bx-shadow-card;
+    -moz-box-shadow: @bx-shadow-card;
+    box-shadow: @bx-shadow-card;
 }
 .bx-popup-applied {
-	border-radius: @bx-border-radius-popup;
-	background-clip: padding-box;    
-
-	-webkit-box-shadow: @bx-shadow-popup;
-	-moz-box-shadow: @bx-shadow-popup;
-	box-shadow: @bx-shadow-popup;
+    border-radius: @bx-border-radius-popup;
+    background-clip: padding-box;
+}
+.bx-popup-applied:not(.bx-popup-chain),
+.bx-popup-applied.bx-popup-chain .bx-popup-chain-item {
+    -webkit-box-shadow: @bx-shadow-popup;
+    -moz-box-shadow: @bx-shadow-popup;
+    box-shadow: @bx-shadow-popup;
+}
+.bx-popup-applied.bx-popup-chain .bx-popup-chain-item a:hover {
+    background-color: @bx-color-hl;
 }
 .bx-popup-wrapper.bx-popup-slide-wrapper {
-	-webkit-box-shadow: @bx-shadow-menu-slide;
-	-moz-box-shadow: @bx-shadow-menu-slide;
-	box-shadow: @bx-shadow-menu-slide;
+    -webkit-box-shadow: @bx-shadow-menu-slide;
+    -moz-box-shadow: @bx-shadow-menu-slide;
+    box-shadow: @bx-shadow-menu-slide;
 }
 .bx-btn {
-	-webkit-box-shadow: @bx-shadow-button;
-	-moz-box-shadow: @bx-shadow-button;
-	box-shadow: @bx-shadow-button;
+    -webkit-box-shadow: @bx-shadow-button;
+    -moz-box-shadow: @bx-shadow-button;
+    box-shadow: @bx-shadow-button;
 }
 .bx-btn.bx-btn-small {
-	-webkit-box-shadow: @bx-shadow-button-small;
-	-moz-box-shadow: @bx-shadow-button-small;
-	box-shadow: @bx-shadow-button-small;
+    -webkit-box-shadow: @bx-shadow-button-small;
+    -moz-box-shadow: @bx-shadow-button-small;
+    box-shadow: @bx-shadow-button-small;
 }
 
 

+ 7 - 9
template/css/common.css

@@ -418,18 +418,13 @@ div.bx-popup-chain {
     position: relative;
     max-width: 22.5rem;
 }
+div.bx-popup-chain-cnt {
+    position: relative;
+}
 div.bx-popup-chain-item {
     position: relative;
-
     width: 100%;
-
-    border-color: rgba(0, 0, 0, 0.2);
-    background-color: #ffffff;
-
-    box-shadow: 1px 1px 5px 0px rgba(0, 0, 0, 0.2);
-}
-div.bx-popup-chain-item-cnt {
-	padding: 1.25rem;
+    overflow: hidden;
 }
 div.bx-popup-chain-item-actions {
     position: absolute;
@@ -452,6 +447,9 @@ div.bx-popup-chain-item-actions .sys-icon {
 	line-height: 1.5rem;
 	text-align: center;
 }
+div.bx-popup-chain-item .bx-loading-ajax {
+    height: auto;
+}
 
 /* --------------- message box */
 .bx-msg-box-container {

+ 17 - 13
template/popup_chain.html

@@ -1,15 +1,19 @@
 <div id="__html_id__" class="bx-popup-chain" style="display:none;">
-	<bx_repeat:items>
-		<div class="bx-popup-chain-item bx-def-border bx-def-round-corners bx-def-box-sizing"<bx_if:show_as_hidden> style="display:none;"</bx_if:show_as_hidden>>
-			<div class="bx-popup-chain-item-cnt">__item__</div>
-			<bx_if:show_previous>
-				<div class="bx-popup-chain-item-actions bx-popup-cia-left">
-					<a href="javascript:void(0)" onclick="javascript:__onclick_previous__;"><i class="sys-icon arrow-left"></i></a>
-				</div>
-			</bx_if:show_previous>
-			<div class="bx-popup-chain-item-actions bx-popup-cia-right">
-				<a href="javascript:void(0)" onclick="javascript:__onclick_close__;"><i class="sys-icon times"></i></a>
-			</div>
-		</div>
-	</bx_repeat:items>
+    <div class="bx-popup-chain-cnt bx-def-padding">
+        <bx_repeat:items>
+            <div class="bx-popup-chain-item bx-popup-color-bg bx-popup-border bx-def-round-corners bx-def-margin-sec-top-auto bx-def-box-sizing"<bx_if:show_as_hidden> style="display:none;"</bx_if:show_as_hidden>>
+                <div class="bx-popup-content">__item__</div>
+                <bx_if:show_previous>
+                    <div class="bx-popup-chain-item-actions bx-popup-cia-left">
+                        <a href="javascript:void(0)" onclick="javascript:__onclick_previous__;"><i class="sys-icon arrow-left"></i></a>
+                    </div>
+                </bx_if:show_previous>
+                <bx_if:show_close>
+                    <div class="bx-popup-chain-item-actions bx-popup-cia-right">
+                        <a href="javascript:void(0)" onclick="javascript:__onclick_close__;"><i class="sys-icon times"></i></a>
+                    </div>
+                </bx_if:show_close>
+            </div>
+        </bx_repeat:items>
+    </div>
 </div>