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.

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

Jump to bottom

Fix #305 Move 1400px media-query to 1100px #396

Merged
merged 15 commits into from
Jan 25, 2018
Merged

Fix #305 Move 1400px media-query to 1100px #396

merged 15 commits into from
Jan 25, 2018

Conversation

Blendify
Copy link
Member

@Blendify Blendify commented Mar 14, 2017 •
edited
Loading

This makes the media-query always equal to the sidebar width + the content width. Fixes #305

@agjohnson agjohnson added the PR: work in progress Pull request is not ready for full review label Mar 14, 2017
@Blendify
Update patch with the ability to chnage the side bar width and conten…
f928c33 
…t width

There is still a bug were the centent width fills the full screen.
This will have to be fixed before merging.
@Blendify
Copy link
Member Author

Ok, I found the issue with the content taking the full width, you can not use calc() inside a media query. We can either hack our way around this or use javascript and get the width of the sidebar (wy-nav-side) then get the with of the content (wy-nav-content). After getting these two values we can pass the value to the media query. This would be the proper solution however, I do not know javascript so someone else will have to do this.

agjohnson
agjohnson previously requested changes Mar 23, 2017
View reviewed changes
Copy link
Collaborator

@agjohnson agjohnson left a comment

Choose a reason for hiding this comment

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

We discussed this one on IRC a bit. I think javascript is the wrong path here.

Blendify added 5 commits March 28, 2017 16:45
@Blendify
Revert "Remove the ability to set sidebar width"
25c5686 
This reverts commit 3ad5b5b.
@Blendify
Revert "Run grunt build"
7648192 
This reverts commit f3f9ff9.
@Blendify
Revert "Use javascript instead"
684bd15 
This reverts commit 630b50f.
@Blendify
Revert "Update patch with the ability to chnage the side bar width an…
175e010 
…d content width"

This reverts commit f928c33.
@Blendify
Merge remote-tracking branch 'refs/remotes/origin/master' into fix-305
320e6ad 
# Conflicts:
#	sphinx_rtd_theme/static/css/theme.css
#	sphinx_rtd_theme/static/css/theme.css.map
@Blendify Blendify added this to the v0.2.6 milestone Jul 30, 2017
@Blendify
Copy link
Member Author

Poke.

@Blendify
Copy link
Member Author

Blendify commented Jan 7, 2018

Can we please merge this?

@davidfischer
Copy link
Contributor

I am going to defer to @agjohnson for final approval but I think this is good to go.

Here's a screenshot to help just visualize the changes:
fix-305

The big difference is that currently in master there is a left margin on the main content block (wy-nav-content) up until width 1400px at which point it drops to zero. The main content block is always the same size (800px) so don't let looks deceive you.

jessetan
jessetan approved these changes Jan 23, 2018
View reviewed changes
Copy link
Contributor

@jessetan jessetan left a comment

Choose a reason for hiding this comment

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

LGTM

@Blendify Blendify mentioned this pull request Jan 25, 2018
Closed
8 tasks
@Blendify
Copy link
Member Author

With two reviews approving this and Anthony not being away I will just merge this.

@Blendify Blendify dismissed agjohnson’s stale review January 25, 2018 15:01

Not updating status

@Blendify Blendify merged commit 419c6f5 into master Jan 25, 2018
@Blendify Blendify deleted the fix-305 branch January 25, 2018 15:28
emilyemorehouse added a commit to cuttlesoft/sphinx_rtd_theme that referenced this pull request Mar 6, 2018
@emilyemorehouse
Merge branch 'rtfd/master'
b949e42 
* rtfd/master: (252 commits)
  Docs: restructure (readthedocs#573)
  Docs: Fix typos (readthedocs#584)
  add missing quotes (bottom should be a string) (readthedocs#580)
  Typo: Contibuting => Contributing
  Allow versions popup to scroll (readthedocs#576)
  Add document block and rename bodycontent content
  Add a block around the page content
  Docs: httpdomain package name uses dash instead of period
  Update changlog for 0.2.5 (readthedocs#570)
  Run Grunt (readthedocs#568)
  Create CODE_OF_CONDUCT.md (readthedocs#562)
  readthedocs#463 - Add github, gitlab, bitbucket page arguments option (readthedocs#464)
  Remove from theme.conf
  Remove from docs
  Update footer.html (readthedocs#561)
  Refactor docs: split up & slim down read me
  Fix readthedocs#305 Move 1400px media-query to 1100px  (readthedocs#396)
  Only output div.articleComments if the block has content (readthedocs#555)
  Readme cleanup (readthedocs#554)
  Add GitHub templates (readthedocs#410)
  ...
@agjohnson agjohnson modified the milestones: v0.3.1, v0.3.0 Mar 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jessetan jessetan jessetan approved these changes

@agjohnson agjohnson agjohnson left review comments

@ericholscher ericholscher Awaiting requested review from ericholscher

Assignees
No one assigned
Labels
PR: work in progress Pull request is not ready for full review
Projects
None yet
Milestone
v0.3.0
Development

Successfully merging this pull request may close these issues.
4 participants
@Blendify @davidfischer @agjohnson @jessetan