Skip to content
This repository has been archived by the owner on Aug 25, 2022. It is now read-only.

Commit

Permalink
Tearing out some more flexbox and replacing with traditional CSS floa…
Browse files Browse the repository at this point in the history
…ts and other techniques for better IE support. Should improve the situation in #22
  • Loading branch information
rickihastings committed Mar 4, 2014
1 parent 32897f6 commit 8926515
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 30 deletions.
13 changes: 0 additions & 13 deletions client/css/ie.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,4 @@

.backlog .row {
padding: 3px;
}

.channel-input input {
width: 85%;
}

.userlist ul li a span.prefix {
padding: 4px 6px 6px 0;
}

.userlist ul li a span.name {
height: auto;
padding: 2px 6px 0 0;
}
1 change: 1 addition & 0 deletions client/js/views/input.view.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
App.InputView = Ember.View.extend({
templateName: 'input',
tagName: 'table',
classNames: 'channel-input',

didInsertElement: function() {
Expand Down
41 changes: 32 additions & 9 deletions client/less/input.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,56 @@

.channel-input {
padding: 0;
margin: 0;
border-top: 2px solid #D9D9D9;
background: @white;
.flex;
width: 100%;
.snap-notop;

td:first-child {
width: 100px;
}

td:last-child {
padding-right: 6px;
}

.nick-button {
width: auto;
margin: 0;
padding: 10px 14px 10px 91px;
padding: 9px 14px 9px 91px;
float: left;
font-size: 13px;
font-weight: bold;
}

input {
form.input-area {
padding: 0 4px;
margin: 0;
border: 1px solid #0069D6;
color: #000000;
color: #000;
background: #fff;
.border-radius(3px);
}

textarea {
outline: 0;
border: 0;
margin: 0;
display: inline-block;
font-size: 13px;
min-height: 18px;
line-height: 18px;
margin: 6px;
padding: 4px;
outline: none;
background: #ffffff;
padding: 4px 0;
text-align: left;
resize: none;
.setflex(1);
width: 100%;
.box-shadow;
}

textarea:focus {
outline: 0;
border: 0;
.box-shadow;
}
}
9 changes: 3 additions & 6 deletions client/less/userlist.less
Original file line number Diff line number Diff line change
Expand Up @@ -42,29 +42,26 @@

a {
text-decoration: none;
padding: 6px;
font-weight: bold;
color: inherit;
.flex;
display: block;

span {
&.prefix {
width: 18px;
display: inline-block;
text-align: center;
.setflex(1);
padding: 6px 0 6px 6px;

&.op { color: darkRed; }
&.halfop { color: darkOrange; }
&.voice { color: blue; }
}

&.name {
display: inline-block;
width: 85%;
overflow: hidden;
text-overflow: ellipsis;
height: 15px;
padding: 6px;
}
}
}
Expand Down
12 changes: 10 additions & 2 deletions client/templates/input.hbs
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
<label for="chat" class="nick-button">{{nick}}</label>
{{input class="command-field" type="text" tabindex="1" valueBinding="inputValue" value=""}}
<tr>
<td>
<label for="chat" class="nick-button">{{nick}}</label>
</td>
<td>
<form class="input-area">
{{textarea class="command-field" type="text" tabindex="1" valueBinding="inputValue" value=""}}
</form>
</td>
</tr>

0 comments on commit 8926515

Please sign in to comment.