diff --git a/client/css/style.css b/client/css/style.css index ffec738c..3be8fbb4 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -246,7 +246,6 @@ kbd { #help .website-link::before, #help .documentation-link::before, #help .report-issue-link::before, -#nick button::before, #image-viewer .previous-image-btn::before, #image-viewer .next-image-btn::before, #sidebar .not-secure-icon::before, @@ -277,6 +276,7 @@ kbd { .context-menu-action-whois::before { content: "\f05a"; /* http://fontawesome.io/icon/info-circle/ */ } .context-menu-action-kick::before { content: "\f05e"; /* http://fontawesome.io/icon/ban/ */ } .context-menu-network::before { content: "\f233"; /* https://fontawesome.com/icons/server?style=solid */ } +.context-menu-edit::before { content: "\f303"; /* https://fontawesome.com/icons/pencil-alt?style=solid */ } #sidebar .not-secure-icon::before { content: "\f071"; /* https://fontawesome.com/icons/exclamation-triangle?style=solid */ @@ -419,19 +419,6 @@ kbd { margin-right: 9px; } -.context-menu-edit::before, -#set-nick::before { - content: "\f303"; /* https://fontawesome.com/icons/pencil-alt?style=solid */ -} - -#submit-nick::before { - content: "\f00c"; /* http://fontawesome.io/icon/check/ */ -} - -#cancel-nick::before { - content: "\f00d"; /* http://fontawesome.io/icon/times/ */ -} - #image-viewer .previous-image-btn::before { content: "\f104"; /* http://fontawesome.io/icon/angle-left/ */ } @@ -1846,67 +1833,21 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */ display: block; } -[contenteditable]:focus { - outline: none; -} - -[contenteditable="true"] { - -webkit-user-select: text; - -moz-user-select: text; - -ms-user-select: text; - user-select: text; - cursor: text; -} - -/* Nick editor */ - #form #nick { background: #f6f6f6; color: #666; - font: inherit; font-size: 13px; margin: 4px; - line-height: 22px; - height: 24px; - padding-left: 9px; - padding-right: 5px; + line-height: 24px; + padding: 0 8px; border-radius: 2px; - flex: 0 0 auto; - border: 1px solid transparent; - transition: border-color 0.2s; -} - -#form #nick-value { - padding-right: 5px; -} - -#form #nick.editable { - border-color: black; -} - -#nick button#set-nick, -#nick button#submit-nick, -#nick button#cancel-nick { - color: #aaa; - width: 18px; -} - -#nick.editable button#set-nick, -#nick.editable #set-nick-tooltip, -#nick button#submit-nick, -#nick:not(.editable) #save-nick-tooltip, -#nick button#cancel-nick, -#nick:not(.editable) #cancel-nick-tooltip { display: none; } -#nick.editable button#submit-nick, -#nick.editable button#cancel-nick { - display: inline-block; +.public #form #nick { + display: block; } -/* End nick editor */ - #form #input { background: transparent; border: none; diff --git a/client/index.html.tpl b/client/index.html.tpl index a07584ca..be00c67e 100644 --- a/client/index.html.tpl +++ b/client/index.html.tpl @@ -60,12 +60,7 @@