From c6bdb1fc44af8c238c96b306f0cfd4999d74ec8c Mon Sep 17 00:00:00 2001 From: Vokhmin Alexey V Date: Fri, 22 Feb 2013 15:17:46 +0400 Subject: [PATCH] #757: some refactoring, move "bootstrap" styles --- app/assets/javascripts/extra/build_list.js | 3 ++- app/assets/stylesheets/design/custom.scss | 16 +--------------- vendor/assets/stylesheets/bootstrap.css | 14 ++++++++++++++ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/assets/javascripts/extra/build_list.js b/app/assets/javascripts/extra/build_list.js index 376ab42c4..32339b000 100644 --- a/app/assets/javascripts/extra/build_list.js +++ b/app/assets/javascripts/extra/build_list.js @@ -54,7 +54,8 @@ $(document).ready(function() { $('#extra-repos-and-build-lists-dialog').dialog({ autoOpen: false, resizable: false, - width: 400 + width: 400, + height: 130 }); $('#extra-repos-and-build-lists .icon-question-sign').click(function() { diff --git a/app/assets/stylesheets/design/custom.scss b/app/assets/stylesheets/design/custom.scss index 1ebdf0a71..679366d38 100644 --- a/app/assets/stylesheets/design/custom.scss +++ b/app/assets/stylesheets/design/custom.scss @@ -1825,23 +1825,9 @@ table#myTable thead tr.search th form.button_to div input { #extra-repos-and-build-lists { width: 330px; .actions { width: 15px; } - .icon-question-sign { - background-position: -96px -96px; - } } -#extra-repos-and-build-lists-dialog, .ui-dialog-titlebar { font-size: 12px; } + #extra-repos-and-build-lists-dialog { text-align: left; p { margin: 0; } -} -[class^="icon-"], [class*=" icon-"] { - display: inline-block; - width: 14px; - height: 14px; - margin-top: 1px; - line-height: 14px; - vertical-align: text-top; - background-image: url("glyphicons-halflings.png"); - background-position: 14px 14px; - background-repeat: no-repeat; } \ No newline at end of file diff --git a/vendor/assets/stylesheets/bootstrap.css b/vendor/assets/stylesheets/bootstrap.css index 5c3b72037..9c77d090a 100644 --- a/vendor/assets/stylesheets/bootstrap.css +++ b/vendor/assets/stylesheets/bootstrap.css @@ -815,3 +815,17 @@ a.badge:hover { .badge-inverse[href] { background-color: #1a1a1a; } +[class^="icon-"], [class*=" icon-"] { + display: inline-block; + width: 14px; + height: 14px; + margin-top: 1px; + line-height: 14px; + vertical-align: text-top; + background-image: url("glyphicons-halflings.png"); + background-position: 14px 14px; + background-repeat: no-repeat; +} +.icon-question-sign { + background-position: -96px -96px; +} \ No newline at end of file