Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Redesign: bring back & restyle room filter field #2267

Merged
merged 10 commits into from
Nov 5, 2018
5 changes: 0 additions & 5 deletions res/css/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ a:visited {

input[type=text], input[type=password], textarea {
background-color: transparent;
color: $primary-fg-color;
}

input[type=text].error, input[type=password].error {
border: 1px solid $warning-color;
}

input[type=text]:focus, input[type=password]:focus, textarea:focus {
Expand Down
57 changes: 7 additions & 50 deletions res/css/structures/_SearchBox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,60 +9,17 @@ You may obtain a copy of the License at

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
widows: THOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
bwindels marked this conversation as resolved.
Show resolved Hide resolved
See the License for the specific language governing permissions and
limitations under the License.
*/

.mx_SearchBox {
height: 24px;
margin-left: 16px;
margin-right: 16px;
padding-top: 24px;
padding-bottom: 22px;

border-bottom: 1px solid $panel-divider-color;

display: flex;
}

.mx_SearchBox_searchButton {
margin-right: 10px;
margin-top: 5px;
pointer-events: none;
}

.mx_SearchBox_closeButton {
cursor: pointer;
margin-top: -5px;
}

.mx_SearchBox_search {
flex: 1 1 auto;
width: 0px;
font-family: $font-family;
font-size: 12px;
margin-top: -2px;
height: 24px;
border: 0px ! important;
/* border-bottom: 1px solid rgba(0, 0, 0, 0.1) ! important; */
border: 0px;
}

.mx_SearchBox_minimise,
.mx_SearchBox_maximise {
margin-top: 3px;
cursor: pointer;
}

.mx_SearchBox_minimise {
margin-left: 10px;
}

.mx_SearchBox_maximise {
margin-left: 9px;
}

.mx_SearchBox object {
pointer-events: none;
background-image: url('../../img/icons-close.svg');
background-repeat: no-repeat;
width: 16px;
height: 16px;
background-position: center;
padding: 9px;
}
30 changes: 5 additions & 25 deletions res/css/views/rooms/_MemberList.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,41 +43,21 @@ limitations under the License.
.mx_MemberList form,
.mx_GroupMemberList form,
.mx_GroupRoomList form {
margin: 8px;
display: flex;
justify-content: flex-end;
align-items: center;
}

.mx_MemberList form > *:not(:first-child),
.mx_GroupMemberList form > *:not(:first-child),
.mx_GroupRoomList form > *:not(:first-child) {
margin-left: 5px;
.mx_MemberList form > *,
.mx_GroupMemberList form > *,
.mx_GroupRoomList form > * {
margin: 9px;
}

.mx_MemberList_query,
.mx_GroupMemberList_query,
.mx_GroupRoomList_query {
flex: 1 1 0;
box-sizing: border-box;
font-family: $font-family;
border-radius: 4px;
padding: 9px;
color: $input-darker-fg-color;
background-color: $input-darker-bg-color;
font-size: 14px;
font-weight: 600;
border: none;
}

.mx_MemberList_query::-webkit-input-placeholder,
.mx_GroupMemberList_query::-webkit-input-placeholder,
.mx_GroupRoomList_query::-webkit-input-placeholder,
.mx_MemberList_query::-moz-placeholder,
.mx_GroupMemberList_query::-moz-placeholder,
.mx_GroupRoomList_query::-moz-placeholder {
color: $input-darker-fg-color;
opacity: 0.5;
font-size: 14px;
}

.mx_MemberList h2, .mx_GroupMemberList h2 {
Expand Down
119 changes: 96 additions & 23 deletions res/img/icons-close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 0 additions & 10 deletions res/img/icons-search-copy.svg

This file was deleted.

21 changes: 14 additions & 7 deletions res/img/icons-search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 0 additions & 17 deletions res/img/search.svg

This file was deleted.

Loading