12:17 p.m.
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
v2: Rebased and removed ISO and IMG icons from Wok and moved to Kimchi.
Samuel Guimarães (2):
Removing Kimchi Peers dropdown from Wok navbar
Minor fixes in form fields
ui/css/src/modules/_wok-forms.scss | 11 +++++++++++
ui/css/wok.css | 11 +++++++++++
ui/js/src/wok.main.js | 29 +----------------------------
3 files changed, 23 insertions(+), 28 deletions(-)
--
2.5.5
12:17 p.m.
New subject: [PATCH 1/2 v2] [Wok] Removing Kimchi Peers dropdown from Wok navbar
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
Signed-off-by: Samuel Guimarães <sguimaraes943(a)gmail.com>
---
ui/js/src/wok.main.js | 29 +----------------------------
1 file changed, 1 insertion(+), 28 deletions(-)
diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js
index 1683c95..eb7fd28 100644
--- a/ui/js/src/wok.main.js
+++ b/ui/js/src/wok.main.js
@@ -297,10 +297,8 @@ wok.main = function() {
* 4) Log-out button click event
* 5) About button click event
* 6) Help button click event
- * 7) Peers button click event
- * 8) Start notifications loop
+ * 7) Start notifications loop
*/
- var searchingPeers = false;
var initListeners = function() {
wok.topic('languageChanged').subscribe(onLanguageChanged);
wok.topic('redirect').subscribe(onWokRedirect);
@@ -380,31 +378,6 @@ wok.main = function() {
// Set handler for help button
$('#btn-help').on('click', wok.openHelp);
-
- // Set handler to peers drop down
- $('#peers').on('click', function() {
-
- // Check if any request is in progress
- if ($('.dropdown', '#peers').is('.open') ||
searchingPeers == true)
- return
-
- $('#search-peers').show();
- $('#no-peers').addClass('hide-content');
- $('a', '#peers').remove();
-
- searchingPeers = true;
-
- kimchi.getPeers(function(data){
- $('#search-peers').hide();
- if (data.length == 0)
- $('#no-peers').removeClass('hide-content');
-
- for(var i=0; i<data.length; i++){
- $('.dropdown-menu ',
'#peers').append("<li><a href='"+data[i]+"'
target='_blank'>"+data[i]+"</a></li>");
- }
- searchingPeers = false;
- });
- });
};
var initUI = function() {
--
2.5.5
12:17 p.m.
New subject: [PATCH 2/2 v2] [Wok] Minor fixes in form fields
From: Samuel Guimarães <sguimaraes943(a)gmail.com>
Signed-off-by: Samuel Guimarães <sguimaraes943(a)gmail.com>
---
ui/css/src/modules/_wok-forms.scss | 11 +++++++++++
ui/css/wok.css | 11 +++++++++++
2 files changed, 22 insertions(+)
diff --git a/ui/css/src/modules/_wok-forms.scss b/ui/css/src/modules/_wok-forms.scss
index 8fb684f..2ab6e7e 100644
--- a/ui/css/src/modules/_wok-forms.scss
+++ b/ui/css/src/modules/_wok-forms.scss
@@ -31,15 +31,26 @@ label {
// Form feedback classes
.form-control-feedback {
+ display: none;
width: 16px;
height: 16px;
}
.has-feedback label ~ .form-control-feedback {
+ display: block;
top: 43px;
margin-right: 10px;
}
+.has-feedback .form-control {
+ padding-right: 12px;
+}
+
+.has-warning.has-feedback form-control,
+.has-error.has-feedback .form-control {
+ padding-right: 42.5px;
+}
+
.has-feedback .form-control-feedback {
display: none;
}
diff --git a/ui/css/wok.css b/ui/css/wok.css
index 1774514..18727b3 100644
--- a/ui/css/wok.css
+++ b/ui/css/wok.css
@@ -1246,15 +1246,26 @@ label {
}
.form-control-feedback {
+ display: none;
width: 16px;
height: 16px;
}
.has-feedback label ~ .form-control-feedback {
+ display: block;
top: 43px;
margin-right: 10px;
}
+.has-feedback .form-control {
+ padding-right: 12px;
+}
+
+.has-warning.has-feedback form-control,
+.has-error.has-feedback .form-control {
+ padding-right: 42.5px;
+}
+
.has-feedback .form-control-feedback {
display: none;
}
--
2.5.5
2787
days inactive
2787
days old
3 comments
2 participants
participants (2)
-
Aline Manera -
sguimaraes943＠gmail.com