public inbox for [email protected]  

help / color / mirror / Atom feed

From: Murtuza Zabuawala <[email protected]>
To: pgadmin-hackers <[email protected]>
To: Khushboo Vashi <[email protected]>
Subject: Re: [pgAdmin4[RM#3948] Fix backform note control style
Date: Fri, 8 Feb 2019 18:26:07 +0530
Message-ID: <CAKKotZTbEUv_gVTkJ9e1cqxXzr_D=p39Le6eb+rs8_kRk_Wc2w@mail.gmail.com> (raw)
In-Reply-To: <CAKKotZQMHP1tWDNzOJg8ajx0coi=xqrxOxV8rLMRaCXtGK+hVQ@mail.gmail.com>
References: <CAKKotZQ_05r3Az6pJYjs60PC+ARswhHz=sEZPnUfST7gfDaqtA@mail.gmail.com>
	<CAFOhELcqqKvPGYk=NSV0hpN+iBut_g1B_Azk2c_Hoe-fRerLtg@mail.gmail.com>
	<CAKKotZQMHP1tWDNzOJg8ajx0coi=xqrxOxV8rLMRaCXtGK+hVQ@mail.gmail.com>

Hi,

PFA updated patch.


Regards,
Murtuza


>
>> On Wed, Jan 30, 2019 at 3:52 PM Murtuza Zabuawala <
>> [email protected]> wrote:
>>
>>> Hi,
>>>
>>> PFA minor patch to fix the style, changed the background colour and text
>>> colour so that it can be readable.
>>>
>>> --
>>> Regards,
>>> Murtuza Zabuawala
>>> EnterpriseDB: http://www.enterprisedb.com
>>> The Enterprise PostgreSQL Company
>>>
>>>


Attachments:

  [application/octet-stream] RM_3948_v1.diff (2.2K, 3-RM_3948_v1.diff)
  download | inline diff:
diff --git a/web/pgadmin/static/js/backform.pgadmin.js b/web/pgadmin/static/js/backform.pgadmin.js
index d180bcbd..c2065a67 100644
--- a/web/pgadmin/static/js/backform.pgadmin.js
+++ b/web/pgadmin/static/js/backform.pgadmin.js
@@ -2380,13 +2380,22 @@ define([
     defaults: {
       label: gettext('Note'),
       text: '',
-      extraClasses: [],
+      extraClasses: ['pg-el-12', 'd-flex'],
       noteClass: 'backform_control_notes',
+      faIcon: 'fa-file-text-o',
+      faExtraClass: 'fa-rotate-180 fa-flip-vertical',
+      iconWidthClass: 'col-0 pr-2',
+      textWidthClass: 'col-12',
     },
     template: _.template([
-      '<div class="<%=noteClass%> pg-el-12 <%=extraClasses.join(\' \')%>">',
-      '<label class="control-label"><%=label%>:</label>',
-      '<span><%=text%></span></div>',
+      '<div class="<%=noteClass%> <%=extraClasses.join(\' \')%>">',
+      '  <div class="<%=iconWidthClass%>">',
+      '    <i class="fa <%=faIcon%> <%=faExtraClass%>" aria-hidden="true"></i>',
+      '  </div>',
+      '  <div class="<%=textWidthClass%>">',
+      '    <span><%=text%></span>',
+      '  </div>',
+      '</div>',
     ].join('\n')),
   });
 
diff --git a/web/pgadmin/static/scss/_backform.overrides.scss b/web/pgadmin/static/scss/_backform.overrides.scss
index 0a413e37..4d4fe376 100644
--- a/web/pgadmin/static/scss/_backform.overrides.scss
+++ b/web/pgadmin/static/scss/_backform.overrides.scss
@@ -50,14 +50,10 @@
 .backform_control_notes {
 	border: $panel-border;
 	border-radius: $border-radius;
-	font-family: $font-family-editor;
-	font-size: 0.8rem;
 	margin: 0 0 10px;
-	padding: 5px 10px;
-	word-wrap: break-word;
-}
-div.backform_control_notes label.control-label {
-	min-width: 0px;
+  padding: 5px 10px;
+  word-wrap: break-word;
+  background: $yellow;
 }
 
 .subnode-header label {
diff --git a/web/pgadmin/static/scss/resources/_default.variables.scss b/web/pgadmin/static/scss/resources/_default.variables.scss
index b25610bd..fc163a6b 100644
--- a/web/pgadmin/static/scss/resources/_default.variables.scss
+++ b/web/pgadmin/static/scss/resources/_default.variables.scss
@@ -3,6 +3,7 @@ $enable-flex: true !default;
 
 $white: #fff;
 $black: #000;
+$yellow: #fff9c4;
 
 $color-bg: $white !default;
 $color-fg: #222222 !default;

view thread (6+ messages)

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: [email protected]
  Cc: [email protected], [email protected]
  Subject: Re: [pgAdmin4[RM#3948] Fix backform note control style
  In-Reply-To: <CAKKotZTbEUv_gVTkJ9e1cqxXzr_D=p39Le6eb+rs8_kRk_Wc2w@mail.gmail.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox