Skip to content

Commit

Permalink
Import subscriptions can now be selected individually and updated mat…
Browse files Browse the repository at this point in the history
…erial design lite
  • Loading branch information
Wassup789 committed Aug 1, 2016
1 parent 361bfb3 commit 7045960
Show file tree
Hide file tree
Showing 9 changed files with 296 additions and 113 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,6 @@ $RECYCLE.BIN/
.Trashes

*~

# Intellij IDEA
.idea/
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Changelog
## v1.1.X.X (XX-XX-2016)
* Altered the popup's uploads search to include video titles
* Implemented watch later feature
* Implemented import subscriptions selection

## v1.1.1.0 (04-15-2016)
* Reverted to old video uploads method due to quota exhaustion
Expand Down
11 changes: 11 additions & 0 deletions YouTube-Notifications.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="jQuery-2.0.0" level="application" />
<orderEntry type="library" name="chrome-DefinitelyTyped" level="application" />
</component>
</module>
16 changes: 14 additions & 2 deletions _locales/en/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,21 @@
"message": "Import Channels"
},
"settings_importChannels_cancel": {
"description": "The label for the change channel's cancel button",
"description": "The label for the import channel's cancel button",
"message": "Cancel"
},
"settings_importChannels_import": {
"description": "The label for the change channel's import button",
"description": "The label for the import channel's import button",
"message": "Import"
},
"settings_importChannels_check": {
"description": "The label for the import channel's check all button",
"message": "Check All"
},
"settings_importChannels_uncheck": {
"description": "The label for the import channel's uncheck all button",
"message": "Uncheck All"
},
"settings_importChannels_titlePrefix": {
"description": "The prefix for the import channel popup's title",
"message": "Importing"
Expand Down Expand Up @@ -151,6 +159,10 @@
"description": "The suffix for the import channel popup's content for statistics downloads",
"message": "of downloads"
},
"settings_importChannelsSelection_title": {
"description": "The title of the import channel selection popup",
"message": "Select Channels to Import"
},
"settings_searchPlaceholder": {
"description": "The label for the search input",
"message": "Search..."
Expand Down
71 changes: 62 additions & 9 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ main {
margin: 3px 0;
}
.overlay {
position: absolute;
position: fixed;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
Expand Down Expand Up @@ -151,6 +151,7 @@ main {
margin-top: 2px;
background: #B71C1C!important;
cursor: pointer!important;
padding: 0;
}
.channel_remove_btn .mdl-button__ripple-container{cursor: pointer!important;}
.channel_info_btn {
Expand All @@ -162,42 +163,44 @@ main {
margin-top: 2px;
background: #2196F3!important;
text-transform: lowercase;
padding: 0;
}
#add_channels-fab {
position: fixed;
right: 20px;
bottom: 20px;
color: #FFFFFF;
background: #2196F3;
z-index: 10;
box-shadow: 0 0 10px rgba(115, 115, 115, 0.75);
}
#add_channels-dialog, #changelog-dialog, #import_channels-dialog {
#add_channels-dialog, #changelog-dialog, #import_channels-dialog, #import_channels_selection-dialog {
position: fixed;
left: 125px;
top: 110px;
z-index: 110;
}
#add_channels-dialog.mdl-card, #changelog-dialog.mdl-card, #import_channels-dialog.mdl-card {width: 350px;}
#add_channels-dialog > .mdl-card__title, #changelog-dialog > .mdl-card__title, #import_channels-dialog > .mdl-card__title {
#add_channels-dialog.mdl-card, #changelog-dialog.mdl-card, #import_channels-dialog.mdl-card, #import_channels_selection-dialog.mdl-card {width: 350px;}
#add_channels-dialog > .mdl-card__title, #changelog-dialog > .mdl-card__title, #import_channels-dialog > .mdl-card__title, #import_channels_selection-dialog > .mdl-card__title {
color: #fff;
height: 176px;
background: url("../img/welcome_card.jpg") center / cover;
}
#add_channels-dialog > .mdl-card__menu, #changelog-dialog > .mdl-card__menu, #import_channels-dialog > .mdl-card__menu {color: #fff;}
#add_channels-dialog > .mdl-card__menu, #changelog-dialog > .mdl-card__menu, #import_channels-dialog > .mdl-card__menu, #import_channels_selection-dialog > .mdl-card__menu {color: #fff;}
#add_channels-more-button, #changelog-close-button, #import_channels-close-button, #import_channels-import-button {
float: right;
float: right;
}
#add_channels-container[data-toggle="false"], #changelog-container[data-toggle="false"], #import_channels-container[data-toggle="false"] {opacity: 0;}
#add_channels-container[data-toggle="false"], #changelog-container[data-toggle="false"], #import_channels-container[data-toggle="false"], #import_channels_selection-container[data-toggle="false"] {opacity: 0;}
#add_channels-container[data-toggle="true"] {opacity: 1;}
#add_channels-dialog .mdl-card__supporting-text, #changelog-dialog .mdl-card__supporting-text {
overflow-y: auto;
width: 100%;
height: 151px;
}
#import_channels-contentTitle, #import_channels-overRecommended, #import_channels-duplicateInfo{
#import_channels-contentTitle, #import_channels-overRecommended, #import_channels-duplicateInfo, #import_channels_selection-contentTitle{
display: block;
}
#import_channels-contentTitle {
#import_channels-contentTitle, #import_channels_selection-contentTitle {
font-weight: bold;
font-size: 16px;
padding: 0 0 10px;
Expand Down Expand Up @@ -438,5 +441,55 @@ main {
font-size: 12px;
}

#import_channels_selection-dialog {
top: 40px;
left: 80px;
width: 450px!important;
height: 510px;
}

#import_channels_selection-container .mdl-card__supporting-text {
width: 100%;
padding: 0;
height: 100%;
}

#import_channels_selectionList {
height: calc(100% - 28px);
padding: 5px 10px 0;
margin: 0 5px;
overflow-y: auto;
}

#import_channels_selectionList .mdl-list__item {
padding: 0 10px;
white-space: nowrap;
cursor: pointer;
}

.import_channels_selectionRow-title {
max-width: 305px;
overflow-x: hidden;
text-overflow: ellipsis;
}

#import_channels_selectionList .mdl-list__item:hover {
background: rgba(0, 0, 0, 0.05);
}

#import_channels_selection-contentTitle {
padding: 5px 0;
box-shadow: 0 0 5px 3px rgba(0, 0, 0, 0.25);
}

.import_channels_selectionRow-val {
pointer-events: none;
}

#import_channels_selection-close-button,
#import_channels_selection-import-button {
float: right;
}

/* SNACKBAR */
.paper-snackbar{transition-property:opacity,bottom,left,right,width,margin,border-radius;transition-duration:.5s;transition-timing-function:ease;font-family:Arial;font-weight:normal;font-size:14px;min-height:14px;background-color:#323232;position:absolute;justify-content:space-between;align-items:center;color:#fff;line-height:22px;padding:18px 24px;opacity:0;min-width:288px;max-width:568px;display:inline-flex;border-radius:2px;margin:24px;bottom:-100px;z-index:100}.paper-snackbar .action{background:inherit;display:inline-block;border:none;font-size:inherit;text-transform:uppercase;color:#ffeb3b;margin:0 0 0 24px;padding:0;min-width:min-content}.paper-snackbar .action:hover{cursor: pointer;}.paper-snackbar .action:focus{outline:none;}
4 changes: 2 additions & 2 deletions css/material.min.css

Large diffs are not rendered by default.

Loading

0 comments on commit 7045960

Please sign in to comment.