[webui] Switch back to our own jquery-ui styles

openSUSE · Jul 1, 2013 · bcbf6f8 · bcbf6f8
1 parent 404b098
commit bcbf6f8
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 74 deletions.
diff --git a/src/webui/app/assets/javascripts/application.js b/src/webui/app/assets/javascripts/application.js
@@ -18,7 +18,6 @@
 //= require jquery.expander.js
 //= require jquery.flot.js
 //= require jquery.flot.stack.js
-//= require jquery.ui.autocomplete
 //= require dataTables/jquery.dataTables
 //= require jquery.tokeninput
 //= require bento/script.js

diff --git a/src/webui/app/assets/stylesheets/application.scss b/src/webui/app/assets/stylesheets/application.scss
@@ -11,15 +11,14 @@
  *= require dataTables/jquery.dataTables
  *= require token-input
  *= require token-input-facebook
- *= require jquery.ui.menu
- *= require jquery.ui.autocomplete
 */
 @import "bento/reset";
 @import "bento/960";
 @import "bento/base";
 
 @import "icons";
 @import "style";
+@import "our-own-jquery-ui.css";
 @import "monitor";
 @import "package";
 @import "project";

diff --git a/src/webui/app/assets/stylesheets/our-own-jquery-ui.css b/src/webui/app/assets/stylesheets/our-own-jquery-ui.css
@@ -0,0 +1,71 @@
+/* Our own jQueryUI styles. We can't use the upstream ones (currently) as they
+ * collide quite heavily with Bento ;-) */
+
+.ui-corner-all {
+  border-radius: 0px; /* Bento's round corners look ugly */
+}
+.ui-autocomplete {
+  position: absolute;
+  cursor: default;
+  padding: 0px;
+  border: 1px solid black;
+  background-color: white;
+  overflow: auto; /* We want a vertical scrollbar... */
+  max-height: 180px;
+}
+.ui-menu-item {
+  margin: 0px;
+  padding: 2px 5px;
+  cursor: default;
+  display: block;
+  /*
+  if width will be 100% horizontal scrollbar will apear
+  when scroll mode will be used
+  */
+  /*width: 100%;*/
+  font: menu;
+  font-size: 12px;
+  /*
+  it is very important, if line-height not setted or setted
+  in relative units scroll will be broken in firefox
+  */
+  line-height: 16px;
+  overflow: hidden;
+}
+.ui-menu-item > a {
+  color: #444444;
+}
+
+/*
+ * jQuery UI Menu 1.8.18
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
+.ui-menu {
+  list-style:none;
+  padding: 2px;
+  margin: 0;
+  display:block;
+  float: left;
+}
+.ui-menu .ui-menu {
+  margin-top: -3px;
+}
+.ui-menu .ui-menu-item {
+  margin:0;
+  padding: 0;
+  zoom: 1;
+  float: left;
+  clear: left;
+  width: 100%;
+}
+.ui-menu .ui-menu-item a.ui-state-hover,
+.ui-menu .ui-menu-item a.ui-state-active {
+  font-weight: normal;
+  margin: -1px;
+}
+
diff --git a/src/webui/app/assets/stylesheets/style.scss b/src/webui/app/assets/stylesheets/style.scss
@@ -288,77 +288,6 @@ table.patchinfo td { vertical-align: middle; }
   visibility: hidden;
 }
 
-/* Our own jQueryUI styles. We can't use the upstream ones (currently) as they
- * collide quite heavily with Bento ;-) */
-
-.ui-corner-all {
-  border-radius: 0px; /* Bento's round corners look ugly */
-}
-.ui-autocomplete {
-  position: absolute;
-  cursor: default;
-  padding: 0px;
-  border: 1px solid black;
-  background-color: white;
-  overflow: auto; /* We want a vertical scrollbar... */
-  max-height: 180px;
-}
-.ui-menu-item {
-  margin: 0px;
-  padding: 2px 5px;
-  cursor: default;
-  display: block;
-  /*
-  if width will be 100% horizontal scrollbar will apear
-  when scroll mode will be used
-  */
-  /*width: 100%;*/
-  font: menu;
-  font-size: 12px;
-  /*
-  it is very important, if line-height not setted or setted
-  in relative units scroll will be broken in firefox
-  */
-  line-height: 16px;
-  overflow: hidden;
-}
-.ui-menu-item > a {
-  color: #444444;
-}
-
-/*
- * jQuery UI Menu 1.8.18
- *
- * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * http://docs.jquery.com/UI/Menu#theming
- */
-.ui-menu {
-  list-style:none;
-  padding: 2px;
-  margin: 0;
-  display:block;
-  float: left;
-}
-.ui-menu .ui-menu {
-  margin-top: -3px;
-}
-.ui-menu .ui-menu-item {
-  margin:0;
-  padding: 0;
-  zoom: 1;
-  float: left;
-  clear: left;
-  width: 100%;
-}
-.ui-menu .ui-menu-item a.ui-state-hover,
-.ui-menu .ui-menu-item a.ui-state-active {
-  font-weight: normal;
-  margin: -1px;
-}
-
 /* A <pre> tag that looks like a <p>: */
 pre.plain {
   background-color: white;