Просмотр исходного кода

ux(less): refactoring and restructuring less files

Torkel Ödegaard 10 лет назад
Родитель
Сommit
f888716d81
36 измененных файлов с 41 добавлено и 178 удалено
  1. 0 0
      public/less/base/fonts.less
  2. 0 0
      public/less/base/forms.less
  3. 0 0
      public/less/base/type.less
  4. 0 1
      public/less/bootswatch.dark.less
  5. 0 1
      public/less/bootswatch.light.less
  6. 0 0
      public/less/components/filter-controls.less
  7. 0 0
      public/less/components/filter-list.less
  8. 0 0
      public/less/components/filter-table.less
  9. 0 0
      public/less/components/gf-form.less
  10. 0 0
      public/less/components/gfbox.less
  11. 0 0
      public/less/components/navbar.less
  12. 0 0
      public/less/components/pagination.less
  13. 0 0
      public/less/components/panel.less
  14. 0 0
      public/less/components/panel_dashlist.less
  15. 0 0
      public/less/components/panel_graph.less
  16. 0 0
      public/less/components/panel_singlestat.less
  17. 0 0
      public/less/components/panel_table.less
  18. 0 0
      public/less/components/search.less
  19. 0 0
      public/less/components/sidemenu.less
  20. 0 0
      public/less/components/submenu.less
  21. 0 0
      public/less/components/tables_lists.less
  22. 0 0
      public/less/components/tabs.less
  23. 0 0
      public/less/components/tagsinput.less
  24. 0 0
      public/less/components/tightform.less
  25. 0 0
      public/less/components/timepicker.less
  26. 0 90
      public/less/dropdown.less
  27. 0 4
      public/less/fonts.less
  28. 41 32
      public/less/grafana.less
  29. 0 0
      public/less/layout/page.less
  30. 0 0
      public/less/pages/admin.less
  31. 0 0
      public/less/pages/alerting.less
  32. 0 0
      public/less/pages/apps.less
  33. 0 0
      public/less/pages/login.less
  34. 0 0
      public/less/pages/playlist.less
  35. 0 50
      public/less/simple-box.less
  36. 0 0
      public/less/utils/validation.less

+ 0 - 0
public/less/gf-fonts.less → public/less/base/fonts.less


+ 0 - 0
public/less/forms.less → public/less/base/forms.less


+ 0 - 0
public/less/type.less → public/less/base/type.less


+ 0 - 1
public/less/bootswatch.dark.less

@@ -200,7 +200,6 @@ legend, label {
 // -----------------------------------------------------
 
 .table {
-
 	.border-radius(1px);
 
 	tbody tr.success td {

+ 0 - 1
public/less/bootswatch.light.less

@@ -165,7 +165,6 @@ a.text-success:hover { color: darken(@green, 10%); }
 }
 
 .btn-group {
-
 	& > .btn:first-child,
 	& > .btn:last-child,
 	& > .dropdown-toggle {

+ 0 - 0
public/less/filter-controls.less → public/less/components/filter-controls.less


+ 0 - 0
public/less/filter-list.less → public/less/components/filter-list.less


+ 0 - 0
public/less/filter-table.less → public/less/components/filter-table.less


+ 0 - 0
public/less/normform.less → public/less/components/gf-form.less


+ 0 - 0
public/less/gfbox.less → public/less/components/gfbox.less


+ 0 - 0
public/less/navbar.less → public/less/components/navbar.less


+ 0 - 0
public/less/pagination.less → public/less/components/pagination.less


+ 0 - 0
public/less/panel.less → public/less/components/panel.less


+ 0 - 0
public/less/panel_dashlist.less → public/less/components/panel_dashlist.less


+ 0 - 0
public/less/panel_graph.less → public/less/components/panel_graph.less


+ 0 - 0
public/less/panel_singlestat.less → public/less/components/panel_singlestat.less


+ 0 - 0
public/less/panel_table.less → public/less/components/panel_table.less


+ 0 - 0
public/less/search.less → public/less/components/search.less


+ 0 - 0
public/less/sidemenu.less → public/less/components/sidemenu.less


+ 0 - 0
public/less/submenu.less → public/less/components/submenu.less


+ 0 - 0
public/less/tables_lists.less → public/less/components/tables_lists.less


+ 0 - 0
public/less/tabs.less → public/less/components/tabs.less


+ 0 - 0
public/less/bootstrap-tagsinput.less → public/less/components/tagsinput.less


+ 0 - 0
public/less/tightform.less → public/less/components/tightform.less


+ 0 - 0
public/less/timepicker.less → public/less/components/timepicker.less


+ 0 - 90
public/less/dropdown.less

@@ -1,90 +0,0 @@
-// ==========================================================================
-// DROPDOWN
-//
-// dropdown.scss
-// ==========================================================================
-
-
-.select-input {
-  display: inline-block;
-  position: relative;
-  width: auto;
-  max-width: 100%;
-  margin: 0 5px;
-  padding: 0 12px 0 6px;
-  border: @grafanaPanelBorder;
-  background-color: @grafanaSelectBackground;
-  background-color: red;
-  overflow: hidden;
-  vertical-align: top;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-}
-
-.select-input > select {
-  width: 115%;
-  min-width: 110%;
-  max-width: 115%;
-  height: 24px;
-  margin: 0;
-  padding: 0 20px 0 0;
-  border: 0;
-  outline: none;
-  background: transparent;
-  color: @linkColor;
-  font-size: 16px;
-  font-weight: 400;
-  line-height: 24px;
-  text-indent: .01px;
-  text-overflow: '';
-  -webkit-appearance: none;
-  -moz-appearance: menulist-text; // was set to "window" and caused odd display on windows and linux.
-  appearance: none;
-}
-
-// This hides native dropdown button arrow in IE
-.select-input > select::-ms-expand {
-  display: none;
-}
-
-.select-input:after {
-  position: absolute;
-  top: 50%;
-  right: 10px;
-  height: 12px;
-  margin-top: -6px;
-  padding: 0;
-  background-color: transparent;
-  color: @linkColor;
-  font: normal normal normal 14px/1 FontAwesome;
-  text-align: center;
-  content: '\f0d7';
-  pointer-events: none;
-}
-
-.select-input > select:focus {
-  outline: none;
-}
-
-// This hides focus around selected option in FF
-.select-input > select:-moz-focusring {
-  color: transparent;
-  text-shadow: 0 0 0 #adafae;
-}
-
-.rt-form .select-input {
-  margin: 0;
-  background: @grafanaSelectBackground;
-}
-
-.rt-form .select-interior {
-  margin: 0;
-  background-color: @inputBackground;
-  border: 1px solid @inputBorder;
-}
-
-.rt-form .select-input > select {
-  height: 34px;
-  line-height: 34px;
-}

Разница между файлами не показана из-за своего большого размера
+ 0 - 4
public/less/fonts.less


+ 41 - 32
public/less/grafana.less

@@ -1,35 +1,44 @@
-@import "type.less";
-@import "login.less";
-@import "submenu.less";
-@import "panel_graph.less";
-@import "panel_dashlist.less";
-@import "panel_singlestat.less";
-@import "panel_table.less";
-@import "bootstrap-tagsinput.less";
-@import "tables_lists.less";
-@import "search.less";
-@import "playlist.less";
-@import "panel.less";
-@import "forms.less";
-@import "tightform.less";
-@import "normform.less";
-@import "sidemenu.less";
-@import "navbar.less";
-@import "gfbox.less";
-@import "admin.less";
-@import "pagination.less";
-@import "validation.less";
-@import "gf-fonts.less";
-@import "tabs.less";
-@import "timepicker.less";
-@import "alerting.less";
-@import "apps.less";
-@import "filter-controls.less";
-@import "filter-list.less";
-@import "filter-table.less";
-@import "simple-box.less";
-@import "dropdown.less";
-@import "page.less";
+
+// BASE
+@import "./base/type.less";
+@import "./base/forms.less";
+@import "./base/fonts.less";
+
+// UTILS
+@import "./utils/validation.less";
+
+// LAYOUTS
+@import "./layout/page.less";
+
+// COMPONENTS
+@import "./components/panel_graph.less";
+@import "./components/submenu.less";
+@import "./components/panel_dashlist.less";
+@import "./components/panel_singlestat.less";
+@import "./components/panel_table.less";
+@import "./components/tagsinput.less";
+@import "./components/tables_lists.less";
+@import "./components/search.less";
+@import "./components/panel.less";
+@import "./components/tightform.less";
+@import "./components/gf-form.less";
+@import "./components/sidemenu.less";
+@import "./components/navbar.less";
+@import "./components/gfbox.less";
+@import "./components/pagination.less";
+@import "./components/tabs.less";
+@import "./components/timepicker.less";
+@import "./components/filter-controls.less";
+@import "./components/filter-list.less";
+@import "./components/filter-table.less";
+
+// PAGES
+@import "./pages/login.less";
+@import "./pages/playlist.less";
+@import "./pages/admin.less";
+@import "./pages/alerting.less";
+@import "./pages/apps.less";
+
 
 .row-control-inner {
   padding:0px;

+ 0 - 0
public/less/page.less → public/less/layout/page.less


+ 0 - 0
public/less/admin.less → public/less/pages/admin.less


+ 0 - 0
public/less/alerting.less → public/less/pages/alerting.less


+ 0 - 0
public/less/apps.less → public/less/pages/apps.less


+ 0 - 0
public/less/login.less → public/less/pages/login.less


+ 0 - 0
public/less/playlist.less → public/less/pages/playlist.less


+ 0 - 50
public/less/simple-box.less

@@ -1,50 +0,0 @@
-
-@simpleBoxBorderWidth:  0.2rem;
-@simpleBoxMargin:  1.5rem;
-@simpleBoxBodyPadding:  1rem 0 0.5rem 1rem;
-
-.simple-box {
-  margin-top: @simpleBoxMargin;
-  background: @grafanaPanelBackground;
-}
-
-.simple-box-header {
-  font-weight: normal;
-  line-height: 2.5rem;
-  color: @textColor;
-  margin: 0;
-  padding-left: 1rem;
-  // border-bottom: @simpleBoxBorderWidth solid @bodyBackground;
-}
-
-.simple-box-column {
-  flex-direction: row;
-  width: 25%;
-  border-right: @simpleBoxBorderWidth solid @bodyBackground;
-  ul {
-    margin: 0.7rem 0 1rem 1.2rem;
-  }
-}
-
-.simple-box-column:last-child {
-  border: none;
-}
-
-.simple-box-column-header {
-  font-size: @fontSizeLarge;
-  i {
-    padding-right: 0.3rem;
-  }
-}
-
-.simple-box-body {
-  padding: @simpleBoxBodyPadding;
-}
-
-.flex-container {
-  display: flex;
-}
-
-.flex-column {
-  flex-direction: row;
-}

+ 0 - 0
public/less/validation.less → public/less/utils/validation.less


Некоторые файлы не были показаны из-за большого количества измененных файлов