#438 ✓ staged
Ben Moskowitz

Tray UI should be no bigger than is necessary to accomodate 4 tracks

Reported by Ben Moskowitz | February 29th, 2012 @ 08:38 PM | in 0.2 - Ghostbusters (closed)

Small is good.

Comments and changes to this ticket

  • Ben Moskowitz

    Ben Moskowitz February 29th, 2012 @ 11:39 PM

    • State changed from “new” to “peer-review-requested”
    • Assigned user changed from “Ben Moskowitz” to “Bobby Richter”
    • Milestone changed from 0.3 - Breakfast Club to 0.2 - Ghostbusters
    • Milestone order changed from “3” to “0”

    Took a stab at this:

    https://github.com/secretrobotron/butter/pull/66

    Just hiding the media URL box for now, as it doesn't do anything in this release.

  • Bobby Richter

    Bobby Richter March 1st, 2012 @ 09:36 AM

    • State changed from “peer-review-requested” to “review-needs-work”
    • Assigned user changed from “Bobby Richter” to “Ben Moskowitz”

    This is way, way, way, way, way, way nicer.

    Same comments apply from #412 though. Horizontal scrollies (scrollbar and zoombar) are about a pixel or two too high.

  • Ben Moskowitz

    Ben Moskowitz March 1st, 2012 @ 02:58 PM

    • State changed from “review-needs-work” to “super-review-requested”
    • Assigned user changed from “Ben Moskowitz” to “Bobby Richter”

    Fixed.

  • Bobby Richter

    Bobby Richter March 1st, 2012 @ 03:28 PM

    • Assigned user changed from “Bobby Richter” to “David Seifried”

    PR+

  • cadecairos

    cadecairos March 1st, 2012 @ 04:27 PM

    This is getting merge conflicts when I try to rebase it on the latest master branch:

    [cadecairos@Christophers-MacBook-Pro butter (t438)]$ git rebase master First, rewinding head to replay your work on top of it...
    Applying: Some CSS changes.
    Using index info to reconstruct a base tree...
    Falling back to patching base and 3-way merge...
    Auto-merging src/ui/butter.ui.css
    Applying: 438 on the wrong branch, just a backup
    Using index info to reconstruct a base tree...
    :195: trailing whitespace.

    <script src="http://cdn.popcornjs.org/code/dist/popcorn.js" /></script>
    

    warning: 1 line adds whitespace errors.
    Falling back to patching base and 3-way merge...
    Auto-merging src/ui/butter.ui.css
    CONFLICT (content): Merge conflict in src/ui/butter.ui.css
    Auto-merging test/template.html
    CONFLICT (content): Merge conflict in test/template.html
    Failed to merge in the changes.
    Patch failed at 0002 438 on the wrong branch, just a backup

  • cadecairos

    cadecairos March 1st, 2012 @ 04:31 PM

    But it looks great :D

    Jon said he would make sure everything merges in cleanly :D

  • David Seifried

    David Seifried March 1st, 2012 @ 05:13 PM

    • State changed from “super-review-requested” to “review-looks-good”
    • Assigned user changed from “David Seifried” to “Bobby Richter”

    Yeap changes look good to me as well. SR+

  • Bobby Richter

    Bobby Richter March 1st, 2012 @ 05:23 PM

    • State changed from “review-looks-good” to “staged”

    I think... I merged this properly.

Please Sign in or create a free account to add a new ticket.

With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.

New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

Popcorn Maker: Software package encompassing several sub-projects in order to deliver an entire popcorn experience.

Butter: Foundation for Popcorn-powered apps (including Popcorn Maker). Track data management, UI construction, other good stuff.

Cornfield: Server infrastructure to store and share popcorn-and-butter-based user data.

And other projects to allow maximal popcorn usability.

Referenced by

Pages