public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Styling move site modal dialog in ios.

Browse source
This commit is contained in:
Samuel Clay 2013-03-04 12:16:22 -08:00
parent e3b536fbed
commit 59332ce127
7 changed files with 108 additions and 4470 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
media/css/modals.css
View file

@ -100,7 +100,6 @@
font-family: "Lucida Sans", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif, inherit;
font-weight: bold;
text-transform: uppercase;
text-align: center;
position: relative;
}

22
media/css/reader.css
View file

@ -542,7 +542,8 @@ body {
}
.NB-feedlist .feed .NB-feed-exception-icon {
background: url('/media/embed/icons/silk/exclamation.png') no-repeat 0 0;
background: url('/media/embed/icons/circular/exclamation.png') no-repeat 0 0;
background-size: 16px;
width: 16px;
height: 16px;
position: absolute;
@ -3627,7 +3628,8 @@ background: transparent;
background-size: 18px 15px;
}
.NB-taskbar .task_view_story.NB-disabled-page .NB-task-image {
background-image: url('/media/embed/icons/silk/error.png');
background-image: url('/media/embed/icons/circular/exclamation.png');
background-size: 16px;
}
.NB-taskbar .NB-task-story-next-positive .NB-task-image {
background: transparent url('/media/embed/icons/circular/g_icn_focus.png') no-repeat 0 0;
@ -3651,10 +3653,12 @@ background: transparent;
margin-top: 5px;
}
.NB-taskbar .task_view_page.NB-exception-page .NB-task-image {
background-image: url('/media/embed/icons/silk/exclamation.png');
background-image: url('/media/embed/icons/circular/exclamation.png');
background-size: 16px;
}
.NB-taskbar .task_view_page.NB-disabled-page .NB-task-image {
background-image: url('/media/embed/icons/silk/error.png');
background-image: url('/media/embed/icons/circular/exclamation.png');
background-size: 16px;
}
.NB-taskbar .NB-task-story-previous .NB-task-image {
left: 12px;
@ -4130,7 +4134,8 @@ form.opml_import_form input {
color: #801A14;
font-weight: bold;
padding: 4px 4px 4px 24px;
background: #FFE1DB url('/media/embed/icons/silk/exclamation.png') no-repeat 4px 4px;
background: #FFE1DB url('/media/embed/icons/circular/exclamation.png') no-repeat 4px 4px;
background-size: 16px;
}
/* ======================= */
/* = Intelligence Slider = */
@ -4784,8 +4789,8 @@ form.opml_import_form input {
overflow: hidden;
}
.NB-modules-center h5.NB-module-header {
text-align: left;
.NB-account h5.NB-module-header {
text-align: center;
}
.NB-module .NB-module-header-left {
float: left;
@ -5674,7 +5679,8 @@ form.opml_import_form input {
background: transparent url('/media/embed/icons/silk/arrow_rotate_clockwise.png') no-repeat 0 1px;
}
.NB-menu-manage .NB-menu-manage-delete-confirm .NB-menu-manage-image {
background: transparent url('/media/embed/icons/silk/exclamation.png') no-repeat 0 1px;
background: transparent url('/media/embed/icons/circular/exclamation.png') no-repeat 0 1px;
background-size: 16px;
font-weight: bold;
}
.NB-menu-manage .NB-menu-manage-move .NB-menu-manage-image {

BIN
media/img/icons/circular/exclamation.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 538 B

2
media/ios/Classes/MoveSiteViewController.m
View file

@ -36,9 +36,11 @@
- (void)viewDidLoad {
UIImageView *folderImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"g_icn_folder.png"]];
folderImage.frame = CGRectMake(0, 0, 16, 16);
[toFolderInput setLeftView:folderImage];
[toFolderInput setLeftViewMode:UITextFieldViewModeAlways];
UIImageView *folderImage2 = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"g_icn_folder_rss.png"]];
folderImage2.frame = CGRectMake(0, 0, 16, 16);
[fromFolderInput setLeftView:folderImage2];
[fromFolderInput setLeftViewMode:UITextFieldViewModeAlways];

11
media/ios/Classes/NewsBlurViewController.m
View file

@ -200,14 +200,21 @@ static const CGFloat kFolderTitleHeight = 28;
UIColorFromRGB(0xFAFAFA), UITextAttributeTextShadowColor,
[NSValue valueWithUIOffset:UIOffsetMake(0, -1)], UITextAttributeTextShadowOffset,
nil]
forState:UIControlStateNormal];
forState:UIControlStateNormal];
[[UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil]
setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
UIColorFromRGB(0xF0F0F0), UITextAttributeTextColor,
UIColorFromRGB(0x202020), UITextAttributeTextShadowColor,
[NSValue valueWithUIOffset:UIOffsetMake(0, -1)], UITextAttributeTextShadowOffset,
nil]
forState:UIControlStateHighlighted];
forState:UIControlStateHighlighted|UIControlStateSelected];
[[UIBarButtonItem appearanceWhenContainedIn:[UINavigationBar class], nil]
setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
UIColorFromRGB(0xB0B0B0), UITextAttributeTextColor,
UIColorFromRGB(0xFAFAFA), UITextAttributeTextShadowColor,
[NSValue valueWithUIOffset:UIOffsetMake(0, -1)], UITextAttributeTextShadowOffset,
nil]
forState:UIControlStateDisabled];
UIInterfaceOrientation orientation = [UIApplication sharedApplication].statusBarOrientation;
[self layoutForInterfaceOrientation:orientation];

4535
media/ios/Resources-iPhone/MoveSiteViewController.xib
View file

File diff suppressed because it is too large Load diff

7
media/js/newsblur/reader/reader.js
View file

@ -1273,7 +1273,9 @@
$(this).tipsy('disable');
});
if (feed && feed.get('disabled_page')) {
if (feed &&
(feed.get('disabled_page') ||
NEWSBLUR.utils.is_url_iframe_buster(feed.get('feed_link')))) {
view = 'feed';
$original_tabs.addClass('NB-disabled-page')
.addClass('NB-disabled')
@ -2382,7 +2384,8 @@
this.open_feed_exception_modal();
return;
} else if (_.contains(['page', 'story'], view) &&
feed && feed.get('disabled_page')) {
feed && (feed.get('disabled_page') ||
NEWSBLUR.utils.is_url_iframe_buster(feed.get('feed_link')))) {
view = 'feed';
} else if ($('.task_view_'+view).hasClass('NB-disabled') ||
$('.task_view_'+view).hasClass('NB-hidden')) {