浏览代码

[sentry] Improved with grant/show advanced css

Enrico Berti 11 年之前
父节点
当前提交
484ae287d2
共有 2 个文件被更改,包括 16 次插入35 次删除
  1. 6 8
      apps/security/src/security/templates/hive.mako
  2. 10 27
      apps/security/static/css/security.css

+ 6 - 8
apps/security/src/security/templates/hive.mako

@@ -69,17 +69,15 @@ ${ layout.menubar(section='hive') }
 
     <select data-bind="options: $root.availableActions, select2: { update: $data.action, type: 'action'}" style="width: 100px"></select>
 
-    <div class="inline-block with-grant-checkbox">
+    <div class="new-line-if-small">
       <label class="checkbox"><input type="checkbox" data-bind="checked: grantOption"> ${ _('With grant') }</label>
+      <a class="pointer showAdvanced" data-bind="click: function(){ showAdvanced(true); }, visible: ! showAdvanced()"><i class="fa fa-cog"></i> ${ _('Show advanced') }</a>
+      <a class="pointer showAdvanced" data-bind="click: function(){ showAdvanced(false); }, visible: showAdvanced()"><i class="fa fa-cog"></i> ${ _('Hide advanced') }</a>
+      <div class="clearfix"></div>
     </div>
 
-    <span class="showAdvancedSpace">&nbsp;&nbsp;</span>
-    <a class="pointer showAdvanced" data-bind="click: function(){ showAdvanced(true); }, visible: ! showAdvanced()"><i class="fa fa-cog"></i> ${ _('Advanced') }</a>
-
-    <div class="clearfix"></div>
-
-    <div class="acl-block-section" data-bind="visible: showAdvanced">
-      <input type="text" data-bind="value: serverName" placeholder="serverName" style="margin-left: 29px">
+    <div class="acl-block-section" data-bind="visible: showAdvanced" style="margin-top: 0">
+      <input type="text" data-bind="value: serverName" placeholder="serverName" style="margin-left: 6px">
       <select data-bind="options: $root.availablePrivileges, select2: { update: $data.privilegeScope, type: 'scope'}" style="width: 100px"></select>
     </div>
   <!-- /ko -->

+ 10 - 27
apps/security/static/css/security.css

@@ -115,21 +115,6 @@
   width: 25%;
 }
 
-.modal .showAdvanced {
-  float:left;
-  margin-top: 4px;
-  margin-left: 6px;
-}
-
-.span6 .acl-block .showAdvanced {
-  float:left;
-  margin-top: 4px;
-  margin-left: 6px;
-}
-.span6 .acl-block .showAdvancedSpacer {
-  display: none;
-}
-
 .span6 .acl-block input[type='text'] {
   width: 21%;
 }
@@ -322,21 +307,19 @@ h1.emptyMessage {
   display: none;
 }
 
-.with-grant-checkbox {
-  vertical-align: middle;
+@media (min-width: 1680px) {
+  .span6 .acl-block .with-grant-checkbox {
+    float: none;
+  }
 }
-
-.with-grant-checkbox label {
-  line-height: 22px;
+.new-line-if-small {
+  height: 35px;
+  line-height: 35px;
+  vertical-align: middle;
 }
 
-.span6 .acl-block .with-grant-checkbox {
+.new-line-if-small label {
   float: left;
   margin-right: 6px;
-  margin-top: 2px;
-  clear: both;
+  margin-top: 7px;
 }
-
-table .showAdvanced {
-  float: none;
-}