Merge pull request #2 from iNovozhilov/master

Assumed default styles
alemonteiro · Apr 13, 2016 · 0afc3e9 · 0afc3e9
2 parents 140f7eb + d4d24d1
commit 0afc3e9
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -69,6 +69,18 @@ in the /node folder.
 
 ## Release Notes ##
 
+### v 0.5.3 ###
+
+Bug Fixes
+
+* Assumed default styles from brackets (all colors and background-colors from the extension css was removed and added the default 'panel' and 'dark' classes)
+
+### v 0.5.2 ###
+
+Bug Fixes
+
+* Added max-height to result panel
+
 ### v 0.5.1 ###
 
 * Started using connection pool for mysql 

diff --git a/html/browser-panel.html b/html/browser-panel.html
@@ -1,4 +1,4 @@
-<div id="brackets-sql-connector-browser" class="brackets-sql-connector-browser">
+<div id="brackets-sql-connector-browser" class="brackets-sql-connector-browser panel dark">
     <div class="header">
 		<label>{{ Strings.EXTENSION_NAME }}</label>
 		<button data-action="setup" class="btn small btn-icon btn-server-setup" title="{{Strings.SERVER_SETUP}}"></button>
@@ -10,4 +10,4 @@
     <div class="">
         <ul class="connections"></ul>
     </div>
-</div>
+</div>
diff --git a/html/dialog-settings.html b/html/dialog-settings.html
@@ -24,7 +24,7 @@ <h2>
        			{{ Strings.SETTINGS_DIALOG_SERVERS }}
        			<button data-button-id="new"  class="dialog-button btn secundary">{{ Strings.SETTINGS_DIALOG_NEW_SERVER }}</button>
        		</h2>
-       		<ul id="brackets-sql-connector-server-list"></ul>
+       		<ul id="brackets-sql-connector-server-list" class="panel"></ul>
        </div>
            <div class="brackets-sql-connector-server-list-panel">
 		   <div class="field-container name">

diff --git a/html/result-pane.html b/html/result-pane.html
@@ -1,4 +1,4 @@
-<div id="brackets-sql-connector-result-pane" class="brackets-sql-connector-result-pane">
+<div id="brackets-sql-connector-result-pane" class="brackets-sql-connector-result-pane panel dark">
 
 	<div class="brackets-sql-connector-results-sets">
 		<ul class="brackets-sql-connector-result-tab-header" class="brackets-sql-connector-clearfix">

diff --git a/html/server-menu.html b/html/server-menu.html
@@ -1,4 +1,4 @@
-<ul class="dropdown-menu dropdownbutton-popup brackets-sql-connector-servers-menu {{MENU_STATUS}}"  tabindex="1">
+<ul class="dropdown-menu dropdownbutton-popup brackets-sql-connector-servers-menu {{MENU_STATUS}} dark "  tabindex="1">
 	<li data-action="new-connection">
 		<a href="#">{{Strings.MANAGE_SERVERS}}</a>
 	</li>

diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
     "title": "SQL Connector & Browser (MySQL, MS SQL Server & PostgreSQL)",
     "description": "Browse Databases and execute commands directly from the editor. Opens views/procedures/functions as documents. Supports MySQL, MS SQL Server and PostgreSQL.",
 	"keywords":["sql connector", "sql", "mssql", "database", "mysql", "database viewer", "execute query", "sql browser", "execute sql", "postgresql", "pgsql"],
-    "version": "0.5.2",
+    "version": "0.5.3",
     "license": "MIT",
   	"homepage": "https://github.com/alemonteiro/brackets-sql-connector.git",
 	"author": {

diff --git a/sql-connector.css b/sql-connector.css
@@ -5,7 +5,7 @@
 	top: 0;
 	z-index: 999;
 	width: 250px;
-	background: #2c2c2c;
+	/*background: #2c2c2c;*/
 	min-height: 450px;
 	padding: 6px;
 	display: none;
@@ -16,7 +16,7 @@
 
 
 #brackets-sql-connector-browser .status-stab{
-    color: #555;
+
     cursor: pointer;
 }
 .brackets-sql-connector-browser table {
@@ -88,7 +88,7 @@ a#brackets-sql-connector-icon.active {
 ul.brackets-sql-connector-servers-menu { max-height: 620px !important; min-height: 100px; height: auto;}
 .brackets-sql-connector-servers-menu li { padding: 3px 0; }
 .brackets-sql-connector-servers-menu li:not(.connect-to):not(.separator):not(.set-current-connection):not(.disconnect-from):hover {
-	background: #1a1a1a;
+	background: rgba(0, 0, 0, 0.25);
 }
 .brackets-sql-connector-servers-menu h2 {font-size: 14px; padding: 2px; font-weight: bold;margin: 0; line-height: normal;}
 .brackets-sql-connector-servers-menu .separator{
@@ -141,14 +141,14 @@ ul.brackets-sql-connector-servers-menu { max-height: 620px !important; min-heigh
 	padding: 0.2em 0.2em;
 }
 #brackets-sql-connector-server-list li.selected {
-	color: #FFF;
+	/*color: #FFF;*/
 	font-weight: bolder;
 	background: #2c2c2c;
 }
 #brackets-sql-connector-server-list li:hover {
-	background: #3c3c3c;
+	/*background: #3c3c3c;*/
 	cursor: pointer;
-	color: #000;
+	/*color: #000;*/
 	font-weight: bold;
 }
 #brackets-sql-connector-server-list li > a.close { display: none;  }
@@ -157,19 +157,19 @@ ul.brackets-sql-connector-servers-menu { max-height: 620px !important; min-heigh
 	right: 0px;
 	top: 0px;
 	display: block;
-	color: #FFF;
+	/*color: #FFF;*/
 	font-size: 1em;
 	cursor: pointer;
 	padding: 0.2em 0.5em;
 	margin: 0;
 }
 #brackets-sql-connector-server-list li:hover > a.close:hover {
 	background: #852222;
-	color: #FFF;
+	/*color: #FFF;*/
 }
 button.btn-server-setup > b {
 	font-weight: bold;
-	color: #FFF;
+	/*color: #FFF;*/
 }
 .brackets-sql-connector-server-list-panel {
 	float: left;
@@ -195,7 +195,7 @@ button.btn-server-setup > b {
 .conn-error {
 	color: #852222;
 	display: block;
-	background: #090909;
+	/*background: #090909;*/
 	border-radius: 4px;
 	font-size: 1.3em;
 	padding: 4px 6px;
@@ -296,7 +296,7 @@ button.btn-server-setup > b {
 
 .brackets-sql-connector-list-tables span.data-type {
 	margin-left: 5px;
-	color: #AAA;
+	/*color: #AAA;*/
 	font-weight: 200;
 }
 
@@ -351,7 +351,7 @@ button.btn-server-setup > b {
 .brackets-sql-connector-status-indicator button.btn-icon {
 	background: none;
 	border: none;
-	color: #FFF;
+	/*color: #FFF;*/
 	background-repeat: no-repeat;
 	background-size: contain;
 	background-position: center center;
@@ -363,9 +363,7 @@ button.btn-server-setup > b {
 	cursor: pointer;
 }
 .brackets-sql-connector-browser button.btn-icon path {
-	fill: #FFF;
-	stroke: #0F0;
-	color: #FFF;
+
 }
 .brackets-sql-connector-browser button.btn-icon.btn-new-query {
 	background-image: url('images/edit_query_white.svg');
@@ -409,7 +407,7 @@ button.btn-server-setup > b {
 	content: " ";
 	background: none;
 	border: none;
-	color: #FFF;
+	/*color: #FFF;*/
 	background-repeat: no-repeat;
 	background-size: contain;
 	background-position: center center;
@@ -444,7 +442,7 @@ button.btn-server-setup > b {
 }
 
 .brackets-sql-connector-result-pane {
-	background: #090909;
+	/*background: #090909;*/
 	padding: 4px 5px;
 	position: relative;
     max-height: 75%;
@@ -468,7 +466,7 @@ button.btn-server-setup > b {
 	padding: 2px;
 	border-collapse: collapse;
 	border: 1px solid #AAA;
-	background: #2c2c2c;
+	/*background: #2c2c2c;*/
 
   	-webkit-user-select: text; 
   	user-select: text;         
@@ -482,10 +480,10 @@ button.btn-server-setup > b {
   	user-select: text;         
 }
 .brackets-sql-connector-result tbody tr {
-	background: #323232;	
+	/*background: #323232;	*/
 }
 .brackets-sql-connector-result tbody tr:nth-child(odd) {
-	background: #424242;	
+	/*background: #424242;	*/
 }
 
 .brackets-sql-connector-results-sets ul {
@@ -498,13 +496,14 @@ button.btn-server-setup > b {
 
 }
 .brackets-sql-connector-results-sets ul li a {
-	padding: 0.1em;
-	color: #666;
+	padding: 0.1em 0.3em;
+	/*color: #666;*/
 	display: inline-block;
 }
 
 .brackets-sql-connector-results-sets ul li.active a {
-	color: #FFF;
+	/*color: #FFF;*/
+	background: rgba(0, 0, 0, 0.4);
 }
 
 .brackets-sql-connector-results-sets > div > div { display: none; }
@@ -523,7 +522,7 @@ button.btn-server-setup > b {
 
 #brackets-sql-connector-log-pane ul{
 	list-style-type: none;
-	background: #1A1A1A;
+	/*background: #1A1A1A;*/
 	margin: 0 2px;
 }
 #brackets-sql-connector-log-pane ul li {
@@ -549,14 +548,14 @@ button.btn-server-setup > b {
   	user-select: text;       
 }
 #brackets-sql-connector-log-pane pre {
-	background: #2c2c2c;
+	/*background: #2c2c2c;*/
 	margin-left: 3px;
 	display: inline-block;
   	-webkit-user-select: text; 
   	user-select: text;       
 }
 .brackets-sql-connector-dialog pre {
-	background: #090909;
+	/*background: #090909;*/
 	margin-left: 3px;
   	-webkit-user-select: text; 
   	user-select: text;