Yuki Takei 5 лет назад
Родитель
Сommit
d7459e6b69

+ 2 - 1
src/client/styles/scss/_editor-attachment.scss

@@ -108,7 +108,8 @@
     border: none;
     border-top: 1px dotted #ccc;
     border-bottom: none;
-    border-radius: 0;
+    // TODO: remove or set value for GW-2531
+    // border-radius: 0;
 
     &:active {
       box-shadow: none;

+ 1 - 1
src/client/styles/scss/_hljs.scss

@@ -3,7 +3,7 @@ pre.hljs {
 
   // override Highlight Js Style Border
   border: 1px solid $gray-500;
-  border-radius: 3px;
+  border-radius: $border-radius;
   &.hljs-no-border {
     border: none;
   }

+ 2 - 2
src/client/styles/scss/_layout.scss

@@ -47,7 +47,7 @@
   text-align: center;
   border: solid 1px #ccc;
   border-right: none;
-  border-radius: 5px 0 0 5px;
+  // border-radius: 5px 0 0 5px;
   transition: 0.3s ease;
 
   &:hover {
@@ -114,7 +114,7 @@
       margin-bottom: 20px;
       font-size: 0.9em;
       border: solid 1px #aaa;
-      border-radius: 5px;
+      // border-radius: 5px;
 
       .revision-toc-head {
         display: inline-block;

+ 22 - 24
src/client/styles/scss/_override-bootstrap-variables.scss

@@ -26,33 +26,25 @@ $line-height-base: 1.42857;
 
 //== Components
 //
-//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
-$border-radius-base: 0;
-$border-radius-large: 0;
-$border-radius-small: 0;
-
-
-//== Buttons
-//
-//## For each of Bootstrap's buttons, define text, background and border color.
-
-$btn-border-radius: 0;
-$btn-border-radius-lg: 0;
-$btn-border-radius-sm: 0;
-
+$border-radius:               .15rem;
+$border-radius-sm:            .1rem;
+$border-radius-lg:            .25rem;
+$border-radius-xl:            .35rem;
 
 
 //== Forms
 //
-$input-border-radius: 0;
-$input-border-radius-lg: 0;
-$input-border-radius-sm: 0;
+// TODO: remove or set value for GW-2531
+// $input-border-radius: 0;
+// $input-border-radius-lg: 0;
+// $input-border-radius-sm: 0;
 
 //== Navs
 
 $nav-link-padding-y: 0.75rem;
 $nav-link-padding-x: 1rem;
-$nav-tabs-border-radius: 0;
+// TODO: remove or set value for GW-2531
+// $nav-tabs-border-radius: 0;
 
 //== Navbar
 $navbar-padding-y: 0;
@@ -60,25 +52,30 @@ $navbar-brand-padding-y: 0;
 $navbar-nav-link-padding-x: 1rem;
 
 //== Dropdowns
-$dropdown-border-radius: 0;
+// TODO: remove or set value for GW-2531
+// $dropdown-border-radius: 0;
 
 //== card
-$card-border-radius: 0;
+// TODO: remove or set value for GW-2531
+// $card-border-radius: 0;
 $card-spacer-y: 7px;
 $card-spacer-x: 15px;
 
 //== Modals
 $modal-content-border-width: 0;
-$modal-content-border-radius: 0;
+// TODO: remove or set value for GW-2531
+// $modal-content-border-radius: 0;
 $modal-header-padding-y: 0.75rem;
 $modal-header-padding-x: 1rem;
 
 //== Alerts
-$alert-border-radius: 0;
+// TODO: remove or set value for GW-2531
+// $alert-border-radius: 0;
 
 //== Progress bar
 $progress-height: 4px;
-$progress-border-radius: 0;
+// TODO: remove or set value for GW-2531
+// $progress-border-radius: 0;
 $progress-bg: #f0f0f0;
 $progress-box-shadow: none;
 
@@ -86,6 +83,7 @@ $progress-box-shadow: none;
 $pre-color: dummyinvalildcolor; // disable pre color specification with invalid value
 
 //== Custom Checkbox
-$custom-checkbox-indicator-border-radius: 0px;
+// TODO: remove or set value for GW-2531
+// $custom-checkbox-indicator-border-radius: 0px;
 $custom-control-indicator-focus-box-shadow: none;
 $custom-control-indicator-size: 1.2rem;

+ 2 - 4
src/client/styles/scss/_override-bootstrap.scss

@@ -60,24 +60,22 @@
   // card (substitute panel of bootstrap3)
   .card {
     margin-bottom: 20px;
-    border-radius: $card-border-radius;
   }
 
   .card-header {
     font-weight: 700;
     text-transform: none;
-    border-radius: $card-border-radius;
   }
 
   .card-header:first-child {
-    border-radius: $card-border-radius;
   }
 
   // Well (substitute Well of bootstrap3)
   .card.well {
     min-height: 20px;
     padding: $card-spacer-y $card-spacer-x;
-    border-radius: 3px;
+    // TODO: remove or set value for GW-2531
+    // border-radius: 3px;
   }
 
   // Dropdowns

+ 3 - 2
src/client/styles/scss/_search.scss

@@ -137,7 +137,8 @@
       > li {
         > a {
           padding: 2px 8px;
-          border-radius: 0;
+          // TODO: remove or set value for GW-2531
+          // border-radius: 0;
 
           &:hover {
             color: inherit;
@@ -187,7 +188,7 @@
         padding: 16px;
         font-size: 13px;
         border: solid 1px #ccc;
-        border-radius: 3px;
+        // border-radius: 3px;
       }
     }
   }

+ 1 - 1
src/client/styles/scss/atoms/_code.scss

@@ -6,6 +6,6 @@
     padding: 2px 4px;
     font-family: $font-family-monospace-not-strictly;
     border: 1px solid;
-    border-radius: 2px;
+    border-radius: $border-radius;
   }
 }

+ 1 - 1
src/client/styles/scss/atoms/_pre.scss

@@ -1,4 +1,4 @@
 pre {
   padding: 0.5em;
-  border-radius: 2px;
+  border-radius: $border-radius;
 }