Skip to content

New apps design #2533

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skjnldsv wants to merge 2 commits into from
Closed

New apps design #2533

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f09579d
First design commit
skjnldsv Dec 6, 2016
1ebabe3
First app uninstall
skjnldsv Dec 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 47 additions & 32 deletions settings/css/settings.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,21 +507,19 @@ span.version {
opacity: .5;
}

.app-level {
margin-top: 8px;
}
.app-level span {
color: #555;
background-color: transparent;
border: 1px solid #555;
border-radius: 3px;
padding: 3px 6px;
padding: 4px 6px;
display: block
}
.app-level .official {
border-color: #37ce02;
background-position: left center;
background-position: 5px center;
padding-left: 25px;
text-align: center;
}

.app-score {
Expand All @@ -540,55 +538,56 @@ span.version {
position: relative;
flex: 0 0 auto;
margin-left: 20px;
flex-flow: column wrap;
display: flex;
padding: 0;
}
#apps-list .section.apps-experimental {
flex-basis: 90%;
}

/* 4 columns */
@media (min-width: 1601px) {
#apps-list .section {
width: 22%;
width: calc(25% - 25px); /* 5margins*20/4 */
box-sizing: border-box;
}
#apps-list .section:nth-child(4n) {
margin-right: 20px;
}
}

/* 3 columns */
@media (min-width: 1201px) and (max-width: 1600px) {
#apps-list .section {
width: 30%;
width: calc(33% - 26px); /* 4margins*20/3 */
box-sizing: border-box;
}
#apps-list .section:nth-child(3n) {
margin-right: 20px;
}
}

@media (min-width: 901px) and (max-width: 1200px), (min-width: 601px) and (max-width: 770px) {
/* 2 columns */
@media (min-width: 951px) and (max-width: 1200px), (min-width: 701px) and (max-width: 770px) {
#apps-list .section {
width: 40%;
width: calc(50% - 30px);/* 3margins*20/2 */
box-sizing: border-box;
}
#apps-list .section:nth-child(2n) {
margin-right: 20px;
}
}

@media (max-width: 600px), (min-width: 771px) and (max-width: 900px) {
/* 1 column */
@media (max-width: 700px), (min-width: 769px) and (max-width: 950px) {
#apps-list .section {
width: 100%;
width: calc(100% - 40px);
box-sizing: border-box;
margin-right: 20px;
}
}

.section h2.app-name {
margin-bottom: 8px;
display: inline;
}
form.section {
position: relative;
}
.followupsection {
display: block;
padding: 0 30px 30px 30px;
Expand All @@ -597,18 +596,20 @@ form.section {
margin-top: -30px;
position: relative;
}
.app-info-container,
.app-details-container {
width: calc(100% - 110px);
}
.app-details-container {
flex-basis: 50%;
}
.app-image {
float: left;
padding-right: 10px;
width: 80px;
height: 80px;
margin-right: 10px;
width: 40px;
height: 40px;
opacity: 0.8;
}
.app-name,
.app-version,
.app-score,
.app-level {
display: inline-block;
overflow: hidden;
}

.app-description-toggle-show,
Expand All @@ -632,10 +633,6 @@ form.section {
white-space: pre-line;
}

#apps-list .groups-enable {
margin-top: 8px;
}

#app-category-1 {
margin-bottom: 18px;
}
Expand Down Expand Up @@ -664,7 +661,25 @@ form.section {
margin-top: 1em;
margin-bottom: 1em;
}

.app-actions-container {
display: flex;
flex-direction: column;
width: 100px;
flex-grow: 0;
flex-basis: 50%;
}
.app-actions-container > div,
.app-actions-container > input:not([type='hidden']) {
margin: 0 0 3px 0;
flex-shrink: 0;
}
.app-actions-container .select2-container-multi .select2-choices {
padding: 0;
}
.app-actions-container .select2-container-multi .select2-choices .select2-search-choice {
margin: 2px;
margin-right: 0;
}

/* LOG */
#log {
Expand Down
12 changes: 6 additions & 6 deletions settings/js/apps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
if (app.update) {
var $update = $('#app-' + app.id + ' .update');
$update.removeClass('hidden');
$update.val(t('settings', 'Update to %s').replace(/%s/g, app.update));
$update.val(t('settings', 'Update (%s)').replace(/%s/g, app.update));
OC.Settings.Apps.State.availableUpdates++;
}
});
Expand Down Expand Up @@ -236,12 +236,12 @@ OC.Settings.Apps = OC.Settings.Apps || {
*/

imageUrl : function (url, appfromstore) {
var img = '<svg width="72" height="72" viewBox="0 0 72 72">';
var img = '<svg width="40" height="40" viewBox="0 0 40 40">';

if (appfromstore) {
img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '" class="app-icon" /></svg>';
img += '<image x="0" y="0" width="40" height="40" preserveAspectRatio="xMinYMin meet" xlink:href="' + url + '" class="app-icon" /></svg>';
} else {
img += '<image x="0" y="0" width="72" height="72" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon"></image></svg>';
img += '<image x="0" y="0" width="40" height="40" preserveAspectRatio="xMinYMin meet" filter="url(#invertIcon)" xlink:href="' + url + '?v=' + oc_config.version + '" class="app-icon"></image></svg>';
}
return img;
},
Expand Down Expand Up @@ -420,8 +420,8 @@ OC.Settings.Apps = OC.Settings.Apps || {
element.val(t('settings','Uninstall'));
} else {
OC.Settings.Apps.rebuildNavigation();
element.parent().fadeOut(function() {
element.remove();
element.parents('.section').fadeOut(function() {
element.parents('.section').remove();
});
}
},'json');
Expand Down
Loading