Skip to content
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.

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

Remove unused styles #66

Merged
merged 1 commit into from
Jan 12, 2017
Merged

Remove unused styles #66

merged 1 commit into from
Jan 12, 2017

Conversation

sendr
Copy link

@sendr sendr commented Jan 12, 2017

  • Remove studio-main-v1.css
  • Add custom style for displaying transcript block in edit modal

Copy link

@z4y4ts z4y4ts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now much cleaner! Few things to tweak before I can give it green light.

border-bottom: 1px solid #e5e5e5;
}

.upload-transcript, .download-transcript {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add newline after ,

font-size: 14px;
margin-right: 2%;
font-weight: 600;
font-size: 1.2rem;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicate font-size

box-sizing: border-box;
}

.upload-transcript:hover, .add-transcript:hover {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add new line after ,

margin-right: 5px;
}

.fa-plus:before {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Use double colon notion: ::before

path_to_fonts=path_to_fonts
)
)
fragment.add_css(self.resource_string("static/css/studio_edit.css"))
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's better call it studio-edit.css with -

Copy link

@z4y4ts z4y4ts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go! Squash and merge it!

 - Remove studio-main-v1.css
 - Add custom style for displaying transcript block in edit modal
@sendr sendr force-pushed the markup/removed_unused_styles branch from d37316e to 3a3a028 Compare January 12, 2017 14:03
@sendr sendr merged commit ffa456a into dev Jan 12, 2017
z4y4ts added a commit that referenced this pull request Jan 18, 2017
* dev:
  Add pylint integration with TravisCI and pylintrc config
  Fix indentation in player-context-menu.js, use dot notation when possible
  Minor JavaScript optimization in studio_edit.js
  Fixed bug with replacing existing language after uploading transcript (#70)
  Downloading transcripts with correct filename (#68)
  fix "get_transcript_download_link" function (#67)
  Make transcripts download link follow selected transcript language (#64)
  Remove unused styles (#66)
  Add display captions
  Fix typo in install_requires section in setup.py
  Wrap transcripts in route_transcript() for on-the-fly convertion
  Fix pycaption dependency specification in requirements.txt
  Reduce code duplication and add docstrings
  Add support for .srt transcripts
  Enable popup submenu in Edge
  Fixed Speed label for Brightcove

# Conflicts:
#	.travis.yml
#	pylintrc
#	requirements.txt
@sendr sendr deleted the markup/removed_unused_styles branch February 24, 2017 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants