首页 发现 帮助
登录
CityApper
/
wagtail
镜像自地址 https://github.com/wagtail/wagtail
2
0
派生 0
文件 工单管理 0 Wiki
浏览代码

remove Hallo styles

LB Johnston 3 年之前
父节点
e20f3f6966
当前提交
5c01ecfa94
共有 12 个文件被更改，包括 7 次插入 和 221 次删除
合并视图 显示文件统计
  1. 0 2
      client/scss/components/_forms.scss
  2. 2 16
      client/scss/components/_icons.scss
  3. 1 1
      client/scss/components/_main-nav.scss
  4. 0 1
      client/scss/elements/_forms.scss
  5. 0 4
      client/src/components/Hallo/Hallo.scss
  6. 0 86
      client/src/components/Hallo/_halloeditor.scss
  7. 0 22
      client/src/components/Hallo/_halloembed.scss
  8. 0 25
      client/src/components/Hallo/_hallotoolbar.scss
  9. 0 24
      client/src/components/Hallo/_richtext-image.scss
  10. 0 9
      client/webpack.config.js
  11. 4 28
      wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss
  12. 0 3
      wagtail/admin/static_src/wagtailadmin/scss/panels/hallo.scss

+ 0 - 2
client/scss/components/_forms.scss
查看文件 

@@ -41,7 +41,6 @@
 
 // input,
 
 // input,
 
 // textarea,
 
 // textarea,
 
 // select,
 
 // select,
 
-// .halloeditor,
 
 // .tagit {
 
 // .tagit {
 
 //     appearance: none;
 
 //     appearance: none;
 
 //     box-sizing: border-box;
 
 //     box-sizing: border-box;
 
@@ -303,7 +302,6 @@ label.required:after {
 
   input,
 
   input,
 
   textarea,
 
   textarea,
 
   select,
 
   select,
 
-  .halloeditor,
 
   .tagit {
 
   .tagit {
 
     border-radius: 3px;
 
     border-radius: 3px;
 
     padding: 0.4em 1em;
 
     padding: 0.4em 1em;

+ 2 - 16
client/scss/components/_icons.scss
查看文件 

@@ -23,29 +23,15 @@
 
 }
 
 }
 
 
 
 .icon:before,
 
 .icon:before,
 
-.icon:after,
 
-.hallotoolbar [class^='icon-'],
 
-.hallotoolbar [class*=' icon-']:before,
 
-.hallotoolbar [class^='icon-']:before {
 
+.icon:after {
 
   @include icon(); // from _mixins.scss
 
   @include icon(); // from _mixins.scss
 
 }
 
 }
 
 
 
 // stylelint-disable-next-line no-duplicate-selectors
 
 // stylelint-disable-next-line no-duplicate-selectors
 
-.icon:after,
 
-.hallotoolbar [class^='icon-']:after,
 
-.hallotoolbar [class^='icon-']:after {
 
+.icon:after {
 
   text-align: right;
 
   text-align: right;
 
 }
 
 }
 
 
 
-// stylelint-disable-next-line no-duplicate-selectors
 
-.hallotoolbar [class^='icon-'],
 
-.hallotoolbar [class*=' icon-']:before,
 
-.hallotoolbar [class*=' icon-']:before,
 
-.hallotoolbar [class^='icon-']:before {
 
-  vertical-align: -10%;
 
-  margin-right: 0;
 
-}
 
-
 
 // =============================================================================
 
 // =============================================================================
 
 // Icon factory methods
 
 // Icon factory methods
 
 // =============================================================================
 
 // =============================================================================

+ 1 - 1
client/scss/components/_main-nav.scss
查看文件 

@@ -515,7 +515,7 @@ body.explorer-open {
 
 
 
 // Avoiding a stacking context for the content-wrapper saves us a world
 
 // Avoiding a stacking context for the content-wrapper saves us a world
 
 // of pain when dealing with overlays that are appended to the end of
 
 // of pain when dealing with overlays that are appended to the end of
 
-// <body>, eg Hallo & calendars. As long as content-wrapper remains floated,
 
+// <body>, e.g. calendars. As long as content-wrapper remains floated,
 
 // the z-index shouldn't be required.
 
 // the z-index shouldn't be required.
 
 
 
 // .content-wrapper {
 
 // .content-wrapper {

+ 0 - 1
client/scss/elements/_forms.scss
查看文件 

@@ -74,7 +74,6 @@ label,
 
 input:not([type='submit']),
 
 input:not([type='submit']),
 
 textarea,
 
 textarea,
 
 select,
 
 select,
 
-.halloeditor,
 
 .tagit {
 
 .tagit {
 
   appearance: none;
 
   appearance: none;
 
   box-sizing: border-box;
 
   box-sizing: border-box;

+ 0 - 4
client/src/components/Hallo/Hallo.scss
查看文件 

@@ -1,4 +0,0 @@
 
-@import './halloeditor';
 
-@import './hallotoolbar';
 
-@import './halloembed';
 
-@import './richtext-image';

+ 0 - 86
client/src/components/Hallo/_halloeditor.scss
查看文件 

@@ -1,86 +0,0 @@
 
-.halloeditor {
 
-  font-family: $font-sans;
 
-  padding-top: 4em;
 
-  min-height: 50px;
 
-  overflow: hidden;
 
-  line-height: 1.5em;
 
-
 
-  // Resetting various html tags that have been messed with by Wagtail's main css
 
-  h1 {
 
-    text-transform: none;
 
-  }
 
-
 
-  h2 {
 
-    text-transform: none;
 
-    display: block;
 
-  }
 
-
 
-  h1 span {
 
-    font-weight: normal;
 
-    color: inherit;
 
-  }
 
-
 
-  *::before,
 
-  *::after {
 
-    display: none;
 
-  }
 
-
 
-  ol,
 
-  ul {
 
-    margin: 1em 0;
 
-    padding: 0 0 0 40px;
 
-  }
 
-
 
-  li {
 
-    display: list-item;
 
-  }
 
-
 
-  ul li {
 
-    list-style-type: disc;
 
-  }
 
-
 
-  ol li {
 
-    list-style-type: decimal;
 
-  }
 
-
 
-  // Set some reasonable default heading styles. These can be overridden in site-specific custom CSS
 
-  // to make them better reflect their appearance on the front-end (however, it's arguably better for editors
 
-  // NOT to be thinking about a specific visual appearance when they choose heading levels...)
 
-  h1,
 
-  h2,
 
-  h3,
 
-  h4,
 
-  h5,
 
-  h6 {
 
-    font-family: inherit;
 
-  }
 
-
 
-  // stylelint-disable-next-line no-duplicate-selectors
 
-  h2 {
 
-    font-size: 2em;
 
-    line-height: 1.2em;
 
-    clear: both;
 
-  }
 
-
 
-  h3 {
 
-    font-size: 1.7em;
 
-    line-height: 1.194em;
 
-  }
 
-
 
-  h4 {
 
-    font-size: 1.5em;
 
-    line-height: 1.267em;
 
-  }
 
-
 
-  h5 {
 
-    // used for large body text, not really heading
 
-    font-size: 1.2em;
 
-    line-height: 1.27em;
 
-  }
 
-
 
-  hr {
 
-    border-bottom: 1px solid #ccc;
 
-    border-top: 0;
 
-    border-left: 0;
 
-  }
 
-}

+ 0 - 22
client/src/components/Hallo/_halloembed.scss
查看文件 

@@ -1,22 +0,0 @@
 
-.halloembed {
 
-  position: relative;
 
-}
 
-
 
-.halloembed__delete {
 
-  position: absolute;
 
-  display: none;
 
-  right: 0;
 
-  cursor: pointer;
 
-
 
-  &::before {
 
-    background-color: rgba(255, 255, 255, 0.8);
 
-  }
 
-
 
-  &:hover::before {
 
-    background-color: $color-white;
 
-  }
 
-
 
-  .inEditMode & {
 
-    display: block;
 
-  }
 
-}

+ 0 - 25
client/src/components/Hallo/_hallotoolbar.scss
查看文件 

@@ -1,25 +0,0 @@
 
-.hallotoolbar {
 
-  position: absolute;
 
-  z-index: 5;
 
-  margin-top: 4em;
 
-  margin-left: 1.2em;
 
-
 
-  &.affixed {
 
-    position: fixed;
 
-    margin-top: 0;
 
-  }
 
-
 
-  // full is added to hallotoolbar when invoked on a field set to the full layout style
 
-  &.full {
 
-    margin-left: $mobile-nice-padding;
 
-
 
-    @include media-breakpoint-up(sm) {
 
-      margin-left: $desktop-nice-padding;
 
-    }
 
-  }
 
-
 
-  button {
 
-    border-radius: 0;
 
-    height: 2.4em;
 
-  }
 
-}

+ 0 - 24
client/src/components/Hallo/_richtext-image.scss
查看文件 

@@ -1,24 +0,0 @@
 
-// These styles correspond to the image formats defined in wagtailimages/formats.py,
 
-// so that images displayed in the rich text field receive more or less the same
 
-// styling that they would receive on the site front-end.
 
-// Wagtail installations that define their own image formats (in a myapp.image_formats module)
 
-// should ideally use the insert_editor_css hook to pass in their own custom CSS to have those
 
-// images render within the rich text area in the same styles that would appear on the front-end.
 
-.richtext-image {
 
-  // close as possible to match line-height space above p
 
-  margin-top: 3px;
 
-
 
-  &.small {
 
-    max-width: 45%;
 
-  }
 
-
 
-  &.left {
 
-    float: left;
 
-    margin-right: 16px;
 
-  }
 
-
 
-  &.right {
 
-    float: right;
 
-    margin-left: 16px;
 
-  }
 
-}

+ 0 - 9
client/webpack.config.js
查看文件 

@@ -182,15 +182,6 @@ module.exports = function exports(env, argv) {
 
     'panels',
 
     'panels',
 
     'draftail.scss',
 
     'draftail.scss',
 
   );
 
   );
 
-  sassEntry[getOutputPath('admin', 'css', 'panels/hallo')] = path.resolve(
 
-    'wagtail',
 
-    'admin',
 
-    'static_src',
 
-    'wagtailadmin',
 
-    'scss',
 
-    'panels',
 
-    'hallo.scss',
 
-  );
 
   sassEntry[getOutputPath('admin', 'css', 'panels/streamfield')] = path.resolve(
 
   sassEntry[getOutputPath('admin', 'css', 'panels/streamfield')] = path.resolve(
 
     'wagtail',
 
     'wagtail',
 
     'admin',
 
     'admin',

+ 4 - 28
wagtail/admin/static_src/wagtailadmin/scss/layouts/page-editor.scss
查看文件 

@@ -243,16 +243,6 @@
 
     }
 
     }
 
   }
 
   }
 
 
 
-  .halloeditor {
 
-    padding-top: 1em; // to provide space for editor buttons
 
-    padding-bottom: 1em;
 
-
 
-    &.expanded {
 
-      padding-top: 5em; // to provide space for editor buttons
 
-      padding-bottom: 2em;
 
-    }
 
-  }
 
-
 
   &.required {
 
   &.required {
 
     > .title-wrapper label:after {
 
     > .title-wrapper label:after {
 
       content: '*';
 
       content: '*';
 
@@ -276,16 +266,6 @@
 
       padding: 0;
 
       padding: 0;
 
     }
 
     }
 
 
 
-    .halloeditor {
 
-      padding-top: 3em; // to provide space for editor buttons
 
-      padding-bottom: 3em;
 
-
 
-      &.expanded {
 
-        padding-top: 5em; // to provide space for editor buttons
 
-        padding-bottom: 5em;
 
-      }
 
-    }
 
-
 
     .error-message {
 
     .error-message {
 
       @include nice-padding();
 
       @include nice-padding();
 
       padding-bottom: 2em;
 
       padding-bottom: 2em;
 
@@ -293,8 +273,7 @@
 
 
 
     .error,
 
     .error,
 
     .error input:not([type='submit']),
 
     .error input:not([type='submit']),
 
-    .error textarea,
 
-    .error .halloeditor {
 
+    .error textarea {
 
       background-color: $color-input-error-bg;
 
       background-color: $color-input-error-bg;
 
     }
 
     }
 
   }
 
   }
 
@@ -431,8 +410,7 @@
 
 // Custom styles that make some fields look more important
 
 // Custom styles that make some fields look more important
 
 .full {
 
 .full {
 
   input:not([type='submit']),
 
   input:not([type='submit']),
 
-  textarea,
 
-  .halloeditor {
 
+  textarea {
 
     @include nice-padding;
 
     @include nice-padding;
 
     border-radius: 0;
 
     border-radius: 0;
 
     padding-top: 1.5em;
 
     padding-top: 1.5em;
 
@@ -444,8 +422,7 @@
 
 
 
 .title {
 
 .title {
 
   input:not([type='submit']),
 
   input:not([type='submit']),
 
-  textarea,
 
-  .halloeditor {
 
+  textarea {
 
     font-size: 2em;
 
     font-size: 2em;
 
     font-family: $font-sans;
 
     font-family: $font-sans;
 
   }
 
   }
 
@@ -564,8 +541,7 @@ footer .preview {
 
       }
 
       }
 
 
 
       input:not([type='submit']),
 
       input:not([type='submit']),
 
-      textarea,
 
-      .halloeditor {
 
+      textarea {
 
         border-width: 0 1px;
 
         border-width: 0 1px;
 
       }
 
       }

+ 0 - 3
wagtail/admin/static_src/wagtailadmin/scss/panels/hallo.scss
查看文件 

@@ -1,3 +0,0 @@
 
-@import '../../../../../../client/scss/settings';
 
-@import '../../../../../../client/scss/tools';
 
-@import '../../../../../../client/src/components/Hallo/Hallo';